net: phy: use ->is_c45 instead of is_10g_interface()

Use phydev->is_c45 instead of is_10g_interface(phydev->interface) to
determine whether clause 45 protocol should be used.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index ba7b361c3d9a19a49fc900db1a89cb2f82f90e2b..7f21c5535ba94fee9f18b58464824f0b916b2dfe 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -632,10 +632,10 @@ static int phy_probe(struct phy_device *phydev)
        return err;
 }
 
-static struct phy_driver *generic_for_interface(phy_interface_t interface)
+static struct phy_driver *generic_for_phy(struct phy_device *phydev)
 {
 #ifdef CONFIG_PHYLIB_10G
-       if (is_10g_interface(interface))
+       if (phydev->is_c45)
                return &gen10g_driver;
 #endif
 
@@ -656,7 +656,7 @@ static struct phy_driver *get_phy_driver(struct phy_device *phydev,
        }
 
        /* If we made it here, there's no driver for this PHY */
-       return generic_for_interface(interface);
+       return generic_for_phy(phydev);
 }
 
 struct phy_device *phy_device_create(struct mii_dev *bus, int addr,
@@ -859,7 +859,7 @@ int phy_reset(struct phy_device *phydev)
 
 #ifdef CONFIG_PHYLIB_10G
        /* If it's 10G, we need to issue reset through one of the MMDs */
-       if (is_10g_interface(phydev->interface)) {
+       if (phydev->is_c45) {
                if (!phydev->mmds)
                        gen10g_discover_mmds(phydev);
 

diff --git a/include/phy.h b/include/phy.h
index 399e050abae3cd1725c32debd95cfd4b8fe69341..c7fa0ffba43f0c9ebb3907f8e3644e6d3fe87187 100644 (file)
--- a/include/phy.h
+++ b/include/phy.h
@@ -359,18 +359,6 @@ static inline int phy_clear_bits_mmd(struct phy_device *phydev, int devad,
 
 #ifdef CONFIG_PHYLIB_10G
 extern struct phy_driver gen10g_driver;
-
-/*
- * List all 10G interfaces here, the assumption being that PHYs on these
- * interfaces are C45
- */
-static inline int is_10g_interface(phy_interface_t interface)
-{
-       return interface == PHY_INTERFACE_MODE_XGMII ||
-              interface == PHY_INTERFACE_MODE_USXGMII ||
-              interface == PHY_INTERFACE_MODE_10GBASER;
-}
-
 #endif
 
 /**