11 files changed, 9 insertions, 84 deletions

diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c
index ac79e16cd7f1..4dec83df048d 100644
--- a/drivers/net/phy/adin.c
+++ b/drivers/net/phy/adin.c
@@ -356,10 +356,6 @@ static int adin_config_init(struct phy_device *phydev)
 
         phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
 
-        rc = genphy_config_init(phydev);
-        if (rc < 0)
-                return rc;
-
         rc = adin_config_rgmii_mode(phydev);
         if (rc < 0)
                 return rc;
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index 222ccd9ecfce..d98aa56710a9 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -249,10 +249,6 @@ static int at803x_config_init(struct phy_device *phydev)
 {
         int ret;
 
-        ret = genphy_config_init(phydev);
-        if (ret < 0)
-                return ret;
-
         /* The RX and TX delay default is:
          *   after HW reset: RX delay enabled and TX delay disabled
          *   after SW reset: RX delay enabled, while TX delay retains the
diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c
index 7ed4760fb155..8a4b1d167ce2 100644
--- a/drivers/net/phy/dp83822.c
+++ b/drivers/net/phy/dp83822.c
@@ -254,13 +254,8 @@ static int dp83822_config_intr(struct phy_device *phydev)
 
 static int dp83822_config_init(struct phy_device *phydev)
 {
-        int err;
         int value;
 
-        err = genphy_config_init(phydev);
-        if (err < 0)
-                return err;
-
         value = DP83822_WOL_MAGIC_EN | DP83822_WOL_SECURE_ON | DP83822_WOL_EN;
 
         return phy_write_mmd(phydev, DP83822_DEVADDR, MII_DP83822_WOL_CFG,
diff --git a/drivers/net/phy/dp83848.c b/drivers/net/phy/dp83848.c
index 6f9bc7d91f17..54c7c1b44e4d 100644
--- a/drivers/net/phy/dp83848.c
+++ b/drivers/net/phy/dp83848.c
@@ -68,13 +68,8 @@ static int dp83848_config_intr(struct phy_device *phydev)
 
 static int dp83848_config_init(struct phy_device *phydev)
 {
-        int err;
         int val;
 
-        err = genphy_config_init(phydev);
-        if (err < 0)
-                return err;
-
         /* DP83620 always reports Auto Negotiation Ability on BMSR. Instead,
          * we check initial value of BMCR Auto negotiation enable bit
          */
@@ -113,13 +108,13 @@ MODULE_DEVICE_TABLE(mdio, dp83848_tbl);
 
 static struct phy_driver dp83848_driver[] = {
         DP83848_PHY_DRIVER(TI_DP83848C_PHY_ID, "TI DP83848C 10/100 Mbps PHY",
-                           genphy_config_init),
+                           NULL),
         DP83848_PHY_DRIVER(NS_DP83848C_PHY_ID, "NS DP83848C 10/100 Mbps PHY",
-                           genphy_config_init),
+                           NULL),
         DP83848_PHY_DRIVER(TI_DP83620_PHY_ID, "TI DP83620 10/100 Mbps PHY",
                            dp83848_config_init),
         DP83848_PHY_DRIVER(TLK10X_PHY_ID, "TI TLK10X 10/100 Mbps PHY",
-                           genphy_config_init),
+                           NULL),
 };
 module_phy_driver(dp83848_driver);
 
diff --git a/drivers/net/phy/dp83tc811.c b/drivers/net/phy/dp83tc811.c
index ac27da16824d..06f08832ebcd 100644
--- a/drivers/net/phy/dp83tc811.c
+++ b/drivers/net/phy/dp83tc811.c
@@ -277,10 +277,6 @@ static int dp83811_config_init(struct phy_device *phydev)
 {
         int value, err;
 
-        err = genphy_config_init(phydev);
-        if (err < 0)
-                return err;
-
         value = phy_read(phydev, MII_DP83811_SGMII_CTRL);
         if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
                 err = phy_write(phydev, MII_DP83811_SGMII_CTRL,
diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c
index fa80d6dce8ee..e8f2ca625837 100644
--- a/drivers/net/phy/meson-gxl.c
+++ b/drivers/net/phy/meson-gxl.c
@@ -136,7 +136,7 @@ static int meson_gxl_config_init(struct phy_device *phydev)
         if (ret)
                 return ret;
 
-        return genphy_config_init(phydev);
+        return 0;
 }
 
 /* This function is provided to cope with the possible failures of this phy
diff --git a/drivers/net/phy/microchip.c b/drivers/net/phy/microchip.c
index eb1b3287fe08..a644e8e5071c 100644
--- a/drivers/net/phy/microchip.c
+++ b/drivers/net/phy/microchip.c
@@ -305,7 +305,6 @@ static int lan88xx_config_init(struct phy_device *phydev)
 {
         int val;
 
-        genphy_config_init(phydev);
         /*Zerodetect delay enable */
         val = phy_read_mmd(phydev, MDIO_MMD_PCS,
                            PHY_ARDENNES_MMD_DEV_3_PHY_CFG);
diff --git a/drivers/net/phy/microchip_t1.c b/drivers/net/phy/microchip_t1.c
index 3d09b471632c..001def4509c2 100644
--- a/drivers/net/phy/microchip_t1.c
+++ b/drivers/net/phy/microchip_t1.c
@@ -48,7 +48,6 @@ static struct phy_driver microchip_t1_phy_driver[] = {
 
                 .features       = PHY_BASIC_T1_FEATURES,
 
-                .config_init    = genphy_config_init,
                 .config_aneg    = genphy_config_aneg,
 
                 .ack_interrupt  = lan87xx_phy_ack_interrupt,
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
index 645d354ffb48..7ada1fd9ca71 100644
--- a/drivers/net/phy/mscc.c
+++ b/drivers/net/phy/mscc.c
@@ -1725,7 +1725,7 @@ static int vsc8584_config_init(struct phy_device *phydev)
                         return ret;
         }
 
-        return genphy_config_init(phydev);
+        return 0;
 
 err:
         mutex_unlock(&phydev->mdio.bus->mdio_lock);
@@ -1767,7 +1767,7 @@ static int vsc85xx_config_init(struct phy_device *phydev)
                         return rc;
         }
 
-        return genphy_config_init(phydev);
+        return 0;
 }
 
 static int vsc8584_did_interrupt(struct phy_device *phydev)
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 9c546bae9ec9..d5db7604d7c4 100644
--- 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/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index 43691b1acfd9..bb680352708a 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -197,7 +197,7 @@ static int vsc738x_config_init(struct phy_device *phydev)
 
         vsc73xx_config_init(phydev);
 
-        return genphy_config_init(phydev);
+        return 0;
 }
 
 static int vsc739x_config_init(struct phy_device *phydev)
@@ -229,7 +229,7 @@ static int vsc739x_config_init(struct phy_device *phydev)
 
         vsc73xx_config_init(phydev);
 
-        return genphy_config_init(phydev);
+        return 0;
 }
 
 static int vsc73xx_config_aneg(struct phy_device *phydev)
@@ -267,7 +267,7 @@ static int vsc8601_config_init(struct phy_device *phydev)
         if (ret < 0)
                 return ret;
 
-        return genphy_config_init(phydev);
+        return 0;
 }
 
 static int vsc824x_ack_interrupt(struct phy_device *phydev)