net: phy: add helper phy_config_aneg

This functionality will also be needed in subsequent patches of this
series, therefore factor it out to a helper.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 537297d2b4b4309adeacd1e66541b2aa1830b8b8..c4aa360dedff20a55f24e2008aea033fc24f50b3 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -467,6 +467,14 @@ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd)
 }
 EXPORT_SYMBOL(phy_mii_ioctl);
 
+static int phy_config_aneg(struct phy_device *phydev)
+{
+       if (phydev->drv->config_aneg)
+               return phydev->drv->config_aneg(phydev);
+       else
+               return genphy_config_aneg(phydev);
+}
+
 /**
  * phy_start_aneg_priv - start auto-negotiation for this PHY device
  * @phydev: the phy_device struct
@@ -493,10 +501,7 @@ static int phy_start_aneg_priv(struct phy_device *phydev, bool sync)
        /* Invalidate LP advertising flags */
        phydev->lp_advertising = 0;
 
-       if (phydev->drv->config_aneg)
-               err = phydev->drv->config_aneg(phydev);
-       else
-               err = genphy_config_aneg(phydev);
+       err = phy_config_aneg(phydev);
        if (err < 0)
                goto out_unlock;