net: phy: don't set state PHY_CHANGELINK in phy_change
State PHY_CHANGELINK isn't needed here, we can call the state machine directly. We just have to remove the check for phy_polling_mode() to make this work also in interrupt mode. Removing this check doesn't cause any overhead because when not polling the state machine is called only if required by some event. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
d79e26a7ef
commit
8deeb6309c
@@ -738,11 +738,6 @@ static irqreturn_t phy_change(struct phy_device *phydev)
|
||||
goto phy_err;
|
||||
}
|
||||
|
||||
mutex_lock(&phydev->lock);
|
||||
if ((PHY_RUNNING == phydev->state) || (PHY_NOLINK == phydev->state))
|
||||
phydev->state = PHY_CHANGELINK;
|
||||
mutex_unlock(&phydev->lock);
|
||||
|
||||
/* reschedule state queue work to run as soon as possible */
|
||||
phy_trigger_machine(phydev);
|
||||
|
||||
@@ -946,9 +941,6 @@ void phy_state_machine(struct work_struct *work)
|
||||
break;
|
||||
case PHY_NOLINK:
|
||||
case PHY_RUNNING:
|
||||
if (!phy_polling_mode(phydev))
|
||||
break;
|
||||
/* fall through */
|
||||
case PHY_CHANGELINK:
|
||||
case PHY_RESUMING:
|
||||
err = phy_check_link_status(phydev);
|
||||
|
Reference in New Issue
Block a user