diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2018-11-09 18:55:50 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-11-11 09:41:32 -0800 |
| commit | 8deeb6309cc447b9b35939558f18e2164dd110df (patch) | |
| tree | d53866ec45d5976807320115b40d022bb9d4b1bf /drivers/net/phy | |
| parent | Merge branch 'remove-PHY_HAS_INTERRUPT' (diff) | |
| download | linux-dev-8deeb6309cc447b9b35939558f18e2164dd110df.tar.xz linux-dev-8deeb6309cc447b9b35939558f18e2164dd110df.zip | |
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>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/phy.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 8dac890f32bf..da41420dfd11 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -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); |