net: phy: remove genphy_config_init

Now that all users have been removed we can remove genphy_config_init.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
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 9c546ba..d5db760 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1885,57 +1885,6 @@ int genphy_soft_reset(struct phy_device *phydev)
 }
 EXPORT_SYMBOL(genphy_soft_reset);
 
-int genphy_config_init(struct phy_device *phydev)
-{
-       int val;
-       __ETHTOOL_DECLARE_LINK_MODE_MASK(features) = { 0, };
-
-       linkmode_set_bit_array(phy_basic_ports_array,
-                              ARRAY_SIZE(phy_basic_ports_array),
-                              features);
-       linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, features);
-       linkmode_set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, features);
-
-       /* Do we support autonegotiation? */
-       val = phy_read(phydev, MII_BMSR);
-       if (val < 0)
-               return val;
-
-       if (val & BMSR_ANEGCAPABLE)
-               linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, features);
-
-       if (val & BMSR_100FULL)
-               linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, features);
-       if (val & BMSR_100HALF)
-               linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, features);
-       if (val & BMSR_10FULL)
-               linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT, features);
-       if (val & BMSR_10HALF)
-               linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, features);
-
-       if (val & BMSR_ESTATEN) {
-               val = phy_read(phydev, MII_ESTATUS);
-               if (val < 0)
-                       return val;
-
-               if (val & ESTATUS_1000_TFULL)
-                       linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
-                                        features);
-               if (val & ESTATUS_1000_THALF)
-                       linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT,
-                                        features);
-               if (val & ESTATUS_1000_XFULL)
-                       linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
-                                        features);
-       }
-
-       linkmode_and(phydev->supported, phydev->supported, features);
-       linkmode_and(phydev->advertising, phydev->advertising, features);
-
-       return 0;
-}
-EXPORT_SYMBOL(genphy_config_init);
-
 /**
  * genphy_read_abilities - read PHY abilities from Clause 22 registers
  * @phydev: target phy_device struct

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 5ac7d21..d26779f 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1069,7 +1069,6 @@ void phy_attached_print(struct phy_device *phydev, const char *fmt, ...)
 void phy_attached_info(struct phy_device *phydev);
 
 /* Clause 22 PHY */
-int genphy_config_init(struct phy_device *phydev);
 int genphy_read_abilities(struct phy_device *phydev);
 int genphy_setup_forced(struct phy_device *phydev);
 int genphy_restart_aneg(struct phy_device *phydev);