phy: atheros: consolidate {ar8031|ar8035}_config()

The two functions are now exactly the same, remove one of them.

Signed-off-by: Michael Walle <michael@walle.cc>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index 314273310520ce6cb25b0eb53bb4fdbcc958a049..47ff9f8d44c079cefe98557f9d459b96adc2e452 100644 (file)
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -311,31 +311,7 @@ static int ar803x_of_init(struct phy_device *phydev)
        return 0;
 }
 
-static int ar8031_config(struct phy_device *phydev)
-{
-       int ret;
-
-       ret = ar803x_of_init(phydev);
-       if (ret < 0)
-               return ret;
-
-       ret = ar803x_delay_config(phydev);
-       if (ret < 0)
-               return ret;
-
-       ret = ar803x_regs_config(phydev);
-       if (ret < 0)
-               return ret;
-
-       phydev->supported = phydev->drv->features;
-
-       genphy_config_aneg(phydev);
-       genphy_restart_aneg(phydev);
-
-       return 0;
-}
-
-static int ar8035_config(struct phy_device *phydev)
+static int ar803x_config(struct phy_device *phydev)
 {
        int ret;
 
@@ -374,7 +350,7 @@ static struct phy_driver AR8031_driver =  {
        .uid = AR8031_PHY_ID,
        .mask = 0xffffffef,
        .features = PHY_GBIT_FEATURES,
-       .config = ar8031_config,
+       .config = ar803x_config,
        .startup = genphy_startup,
        .shutdown = genphy_shutdown,
 };
@@ -384,7 +360,7 @@ static struct phy_driver AR8035_driver =  {
        .uid = AR8035_PHY_ID,
        .mask = 0xffffffef,
        .features = PHY_GBIT_FEATURES,
-       .config = ar8035_config,
+       .config = ar803x_config,
        .startup = genphy_startup,
        .shutdown = genphy_shutdown,
 };