diff options
author | David S. Miller <davem@davemloft.net> | 2019-03-03 21:48:06 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-03-03 21:48:06 -0800 |
commit | 7d827379b062533085f3cd31762a8bb7bf48df19 (patch) | |
tree | 5a01c7bc9878996169117e00bb18e78c7ce0a1f9 /drivers/net/phy/phy.c | |
parent | fsl/fman: Use vsprintf extension %pM (diff) | |
parent | net: phy: remove gen10g_no_soft_reset (diff) | |
download | linux-dev-7d827379b062533085f3cd31762a8bb7bf48df19.tar.xz linux-dev-7d827379b062533085f3cd31762a8bb7bf48df19.zip |
Merge branch 'net-phy-clean-up-the-old-gen10g-functions'
Heiner Kallweit says:
====================
net: phy: clean up the old gen10g functions
The old gen10g_ functions are mainly stubs and have been superseded
by genphy_c45_ equivalents. So lets remove / hide the old functions
as far as possible.
====================
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); |