xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: phy: merge phy_start_aneg and phy_start_aneg_priv

Browse Source 
After commit 9f2959b6b5 ("net: phy: improve handling delayed work")
the sync parameter isn't needed any longer in phy_start_aneg_priv().
This allows to merge phy_start_aneg() and phy_start_aneg_priv().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit
2018-10-15 21:25:13 +02:00
committed by David S. Miller
parent 0054795561
commit c45d715065
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/phy/phy.c
View File

@@ -482,16 +482,15 @@ static int phy_config_aneg(struct phy_device *phydev)
} }
/** /**
* phy_start_aneg_priv - start auto-negotiation for this PHY device * phy_start_aneg - start auto-negotiation for this PHY device
* @phydev: the phy_device struct * @phydev: the phy_device struct
* @sync: indicate whether we should wait for the workqueue cancelation
* *
* Description: Sanitizes the settings (if we're not autonegotiating * Description: Sanitizes the settings (if we're not autonegotiating
* them), and then calls the driver's config_aneg function. * them), and then calls the driver's config_aneg function.
* If the PHYCONTROL Layer is operating, we change the state to * If the PHYCONTROL Layer is operating, we change the state to
* reflect the beginning of Auto-negotiation or forcing. * reflect the beginning of Auto-negotiation or forcing.
*/ */
static int phy_start_aneg_priv(struct phy_device *phydev, bool sync) int phy_start_aneg(struct phy_device *phydev)
{ {
bool trigger = 0; bool trigger = 0;
int err; int err;
@@ -541,20 +540,6 @@ out_unlock:
return err; return err;
} }
/**
* phy_start_aneg - start auto-negotiation for this PHY device
* @phydev: the phy_device struct
*
* Description: Sanitizes the settings (if we're not autonegotiating
* them), and then calls the driver's config_aneg function.
* If the PHYCONTROL Layer is operating, we change the state to
* reflect the beginning of Auto-negotiation or forcing.
*/
int phy_start_aneg(struct phy_device *phydev)
{
return phy_start_aneg_priv(phydev, true);
}
EXPORT_SYMBOL(phy_start_aneg); EXPORT_SYMBOL(phy_start_aneg);
static int phy_poll_aneg_done(struct phy_device *phydev) static int phy_poll_aneg_done(struct phy_device *phydev)
@@ -1085,7 +1070,7 @@ void phy_state_machine(struct work_struct *work)
mutex_unlock(&phydev->lock); mutex_unlock(&phydev->lock);
if (needs_aneg) if (needs_aneg)
err = phy_start_aneg_priv(phydev, false); err = phy_start_aneg(phydev);
else if (do_suspend) else if (do_suspend)
phy_suspend(phydev); phy_suspend(phydev);