Commit 372788f9 authored by Lendacky, Thomas's avatar Lendacky, Thomas Committed by David S. Miller

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: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5ab1dcd5
...@@ -1290,15 +1290,6 @@ static int greth_mdio_probe(struct net_device *dev) ...@@ -1290,15 +1290,6 @@ static int greth_mdio_probe(struct net_device *dev)
return 0; 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) static int greth_mdio_init(struct greth_private *greth)
{ {
int ret; int ret;
......
...@@ -143,13 +143,14 @@ static int phy_config_interrupt(struct phy_device *phydev, u32 interrupts) ...@@ -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 * Returns > 0 on success or < 0 on error. 0 means that auto-negotiation
* is still pending. * 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) if (phydev->drv->aneg_done)
return phydev->drv->aneg_done(phydev); return phydev->drv->aneg_done(phydev);
return genphy_aneg_done(phydev); return genphy_aneg_done(phydev);
} }
EXPORT_SYMBOL(phy_aneg_done);
/* A structure for mapping a particular speed and duplex /* A structure for mapping a particular speed and duplex
* combination to a particular SUPPORTED and ADVERTISED value * combination to a particular SUPPORTED and ADVERTISED value
......
...@@ -786,6 +786,7 @@ void phy_detach(struct phy_device *phydev); ...@@ -786,6 +786,7 @@ void phy_detach(struct phy_device *phydev);
void phy_start(struct phy_device *phydev); void phy_start(struct phy_device *phydev);
void phy_stop(struct phy_device *phydev); void phy_stop(struct phy_device *phydev);
int phy_start_aneg(struct phy_device *phydev); int phy_start_aneg(struct phy_device *phydev);
int phy_aneg_done(struct phy_device *phydev);
int phy_stop_interrupts(struct phy_device *phydev); int phy_stop_interrupts(struct phy_device *phydev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment