net: phy: expose phy_aneg_done API for use by drivers

tlendacky · davem330 · commit 372788f964c9 · 2016-11-13T00:56:26.000-05:00
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 &lt;thomas.lendacky@amd.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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
@@ -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
diff --git a/include/linux/phy.h b/include/linux/phy.h
@@ -786,6 +786,7 @@ void phy_detach(struct phy_device *phydev);
 void phy_start(struct phy_device *phydev);
 void phy_stop(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);
 

Original file line number	Diff line number	Diff line change
`@@ -143,13 +143,14 @@ static int phy_config_interrupt(struct phy_device *phydev, u32 interrupts)`
`143`	`143`	`* Returns > 0 on success or < 0 on error. 0 means that auto-negotiation`
`144`	`144`	`* is still pending.`
`145`	`145`	`*/`
`146`		`-static inline int phy_aneg_done(struct phy_device *phydev)`
	`146`	`+int phy_aneg_done(struct phy_device *phydev)`
`147`	`147`	`{`
`148`	`148`	`if (phydev->drv->aneg_done)`
`149`	`149`	`return phydev->drv->aneg_done(phydev);`
`150`	`150`
`151`	`151`	`return genphy_aneg_done(phydev);`
`152`	`152`	`}`
	`153`	`+EXPORT_SYMBOL(phy_aneg_done);`
`153`	`154`
`154`	`155`	`/* A structure for mapping a particular speed and duplex`
`155`	`156`	`* combination to a particular SUPPORTED and ADVERTISED value`