net: phy: marvell10g: improve mv3310_config_aneg

Now that genphy_c45_pma_setup_forced() makes sure the "aneg enabled"
bit is cleared, the call to genphy_c45_an_disable_aneg() isn't needed
any longer. And the code pattern is now the same as in
genphy_config_aneg().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@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 f9e0a2fc0277503560ed64662dafbfe1fce1bf55..9ea27acf05ad6fd7f26fd513d7d4fc70eea4d8ec 100644 (file)
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -268,13 +268,8 @@ static int mv3310_config_aneg(struct phy_device *phydev)
        /* We don't support manual MDI control */
        phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
 
-       if (phydev->autoneg == AUTONEG_DISABLE) {
-               ret = genphy_c45_pma_setup_forced(phydev);
-               if (ret < 0)
-                       return ret;
-
-               return genphy_c45_an_disable_aneg(phydev);
-       }
+       if (phydev->autoneg == AUTONEG_DISABLE)
+               return genphy_c45_pma_setup_forced(phydev);
 
        ret = genphy_c45_an_config_aneg(phydev);
        if (ret < 0)