From: Russell King Date: Tue, 17 Dec 2019 13:39:52 +0000 (+0000) Subject: net: phy: marvell: use genphy_check_and_restart_aneg() X-Git-Tag: v5.6-rc1~151^2~227^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b5abac2d2d17ce1b30c267dd72fb91c8bc21bee1;p=users%2Fjedix%2Flinux-maple.git net: phy: marvell: use genphy_check_and_restart_aneg() Use the helper to check and restart autonegotiation for the marvell fiber page negotiation setting. Signed-off-by: Russell King Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller --- diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 7da64208365b..28e33ece4ce1 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -534,26 +534,7 @@ static int marvell_config_aneg_fiber(struct phy_device *phydev) if (err > 0) changed = 1; - if (changed == 0) { - /* Advertisement hasn't changed, but maybe aneg was never on to - * begin with? Or maybe phy was isolated? - */ - int ctl = phy_read(phydev, MII_BMCR); - - if (ctl < 0) - return ctl; - - if (!(ctl & BMCR_ANENABLE) || (ctl & BMCR_ISOLATE)) - changed = 1; /* do restart aneg */ - } - - /* Only restart aneg if we are advertising something different - * than we were before. - */ - if (changed > 0) - changed = genphy_restart_aneg(phydev); - - return changed; + return genphy_check_and_restart_aneg(phydev, changed); } static int m88e1510_config_aneg(struct phy_device *phydev)