net: phy: marvell10g: use genphy_c45_check_and_restart_aneg in mv3310_config_aneg

Use new function genphy_c45_check_and_restart_aneg() to reduce
boilerplate code.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index 9ea27acf05ad6fd7f26fd513d7d4fc70eea4d8ec..586ae1bc5a505a5749422ca5775100f0dc8a21f4 100644 (file)
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -288,20 +288,7 @@ static int mv3310_config_aneg(struct phy_device *phydev)
        if (ret > 0)
                changed = true;
 
-       if (!changed) {
-               /* Configure and restart aneg if it wasn't set before */
-               ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_CTRL1);
-               if (ret < 0)
-                       return ret;
-
-               if (!(ret & MDIO_AN_CTRL1_ENABLE))
-                       changed = 1;
-       }
-
-       if (changed)
-               ret = genphy_c45_restart_aneg(phydev);
-
-       return ret;
+       return genphy_c45_check_and_restart_aneg(phydev, changed);
 }
 
 static int mv3310_aneg_done(struct phy_device *phydev)