diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2019-12-17 13:39:52 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-12-19 12:52:34 -0800 |
| commit | b5abac2d2d17ce1b30c267dd72fb91c8bc21bee1 (patch) | |
| tree | f5bd92bb1f6cab36652323fe5d0ee9629b8586c4 /drivers | |
| parent | net: phy: marvell: use phy_modify_changed() (diff) | |
| download | linux-dev-b5abac2d2d17ce1b30c267dd72fb91c8bc21bee1.tar.xz linux-dev-b5abac2d2d17ce1b30c267dd72fb91c8bc21bee1.zip | |
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 <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/marvell.c | 21 |
1 files changed, 1 insertions, 20 deletions
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) |