net: phy: Add helpers to determine if PHY driver is generic

We are already checking in phy_detach() that the PHY driver is of
generic kind (1G or 10G) and we are going to make use of that in the SFP
layer as well for 1000BaseT SFP modules, so expose helper functions to
return that information.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index bb1410821ce4618f84457b795bbc05e71820d821..c02669270c413c3f9c177985eebcf09c2d9f4f83 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1277,6 +1277,36 @@ struct phy_device *phy_attach(struct net_device *dev, const char *bus_id,
 }
 EXPORT_SYMBOL(phy_attach);
 
+static bool phy_driver_is_genphy_kind(struct phy_device *phydev,
+                                     struct device_driver *driver)
+{
+       struct device *d = &phydev->mdio.dev;
+       bool ret = false;
+
+       if (!phydev->drv)
+               return ret;
+
+       get_device(d);
+       ret = d->driver == driver;
+       put_device(d);
+
+       return ret;
+}
+
+bool phy_driver_is_genphy(struct phy_device *phydev)
+{
+       return phy_driver_is_genphy_kind(phydev,
+                                        &genphy_driver.mdiodrv.driver);
+}
+EXPORT_SYMBOL_GPL(phy_driver_is_genphy);
+
+bool phy_driver_is_genphy_10g(struct phy_device *phydev)
+{
+       return phy_driver_is_genphy_kind(phydev,
+                                        &genphy_10g_driver.mdiodrv.driver);
+}
+EXPORT_SYMBOL_GPL(phy_driver_is_genphy_10g);
+
 /**
  * phy_detach - detach a PHY device from its network device
  * @phydev: target phy_device struct
@@ -1308,8 +1338,8 @@ void phy_detach(struct phy_device *phydev)
         * from the generic driver so that there's a chance a
         * real driver could be loaded
         */
-       if (phydev->mdio.dev.driver == &genphy_10g_driver.mdiodrv.driver ||
-           phydev->mdio.dev.driver == &genphy_driver.mdiodrv.driver)
+       if (phy_driver_is_genphy(phydev) ||
+           phy_driver_is_genphy_10g(phydev))
                device_release_driver(&phydev->mdio.dev);
 
        /*

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 3b051f7614505ada10ac2a5bebbabf4f6cf9c8b4..f1c19bf8c658ff20bd5578758112b6572b4a121b 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1183,4 +1183,7 @@ module_exit(phy_module_exit)
 #define module_phy_driver(__phy_drivers)                               \
        phy_module_driver(__phy_drivers, ARRAY_SIZE(__phy_drivers))
 
+bool phy_driver_is_genphy(struct phy_device *phydev);
+bool phy_driver_is_genphy_10g(struct phy_device *phydev);
+
 #endif /* __PHY_H */