diff options
| author | Lendacky, Thomas | 2016-11-11 00:10:46 +0100 |
|---|---|---|
| committer | David S. Miller | 2016-11-13 06:56:26 +0100 |
| commit | 372788f964c95a6fa0f677c43d6153c27896ef42 (patch) | |
| tree | f918ac9bdca4dfbacb15fc79cbde7877b72807e8 /drivers | |
| parent | amd-xgbe: Add I2C support for sideband communication (diff) | |
| download | kernel-qcow2-linux-372788f964c95a6fa0f677c43d6153c27896ef42.tar.gz kernel-qcow2-linux-372788f964c95a6fa0f677c43d6153c27896ef42.tar.xz kernel-qcow2-linux-372788f964c95a6fa0f677c43d6153c27896ef42.zip | |
net: phy: expose phy_aneg_done API for use by drivers
Make phy_aneg_done() available to drivers so that the result of the
auto-negotiation initiated by phy_start_aneg() can be determined.
Remove the local implementation of phy_aneg_done() from the Aeroflex
driver and use the phy library version.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/aeroflex/greth.c | 9 | ||||
| -rw-r--r-- | drivers/net/phy/phy.c | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c index f8df8248035e..93def92f9997 100644 --- a/drivers/net/ethernet/aeroflex/greth.c +++ b/drivers/net/ethernet/aeroflex/greth.c @@ -1290,15 +1290,6 @@ static int greth_mdio_probe(struct net_device *dev) return 0; } -static inline int phy_aneg_done(struct phy_device *phydev) -{ - int retval; - - retval = phy_read(phydev, MII_BMSR); - - return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE); -} - static int greth_mdio_init(struct greth_private *greth) { int ret; diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 2f94c60d4939..e6dd222fddb1 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -143,13 +143,14 @@ static int phy_config_interrupt(struct phy_device *phydev, u32 interrupts) * Returns > 0 on success or < 0 on error. 0 means that auto-negotiation * is still pending. */ -static inline int phy_aneg_done(struct phy_device *phydev) +int phy_aneg_done(struct phy_device *phydev) { if (phydev->drv->aneg_done) return phydev->drv->aneg_done(phydev); return genphy_aneg_done(phydev); } +EXPORT_SYMBOL(phy_aneg_done); /* A structure for mapping a particular speed and duplex * combination to a particular SUPPORTED and ADVERTISED value |