Commit 30de65c3 authored Feb 16, 2019 by Heiner Kallweit Committed by David S. Miller Feb 20, 2019

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>

parent 29f000f7

drivers/net/phy/marvell10g.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -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)