diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2019-03-02 17:10:00 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-03-03 21:47:42 -0800 |
| commit | d7bed825ba1264ab2244be5b547d7feedfacf811 (patch) | |
| tree | 76ebc1b61ddfaf25884b2368b61f6d1e0fe38986 /drivers/net/phy/phy.c | |
| parent | fsl/fman: Use vsprintf extension %pM (diff) | |
| download | linux-dev-d7bed825ba1264ab2244be5b547d7feedfacf811.tar.xz linux-dev-d7bed825ba1264ab2244be5b547d7feedfacf811.zip | |
net: phy: use genphy_c45_aneg_done in genphy_aneg_done
Now that we have it let's use genphy_c45_aneg_done() in phy_aneg_done().
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 69dc64a4dbf8..3745220c5c98 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -144,14 +144,10 @@ int phy_aneg_done(struct phy_device *phydev) { if (phydev->drv && phydev->drv->aneg_done) return phydev->drv->aneg_done(phydev); - - /* Avoid genphy_aneg_done() if the Clause 45 PHY does not - * implement Clause 22 registers - */ - if (phydev->is_c45 && !(phydev->c45_ids.devices_in_package & BIT(0))) - return -EINVAL; - - return genphy_aneg_done(phydev); + else if (phydev->is_c45) + return genphy_c45_aneg_done(phydev); + else + return genphy_aneg_done(phydev); } EXPORT_SYMBOL(phy_aneg_done); |