diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2023-09-14 18:35:36 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-09-17 16:31:23 +0300 |
| commit | ef113a60d0a901c28c1b844bf967c180528155c5 (patch) | |
| tree | 981a69da8ca554966bd0cdad169554730d181f17 /drivers/net/phy | |
| parent | 8da77df649c43d9cec70d683ee317ba5d49d09b7 (diff) | |
| download | linux-ef113a60d0a901c28c1b844bf967c180528155c5.tar.xz | |
net: phy: call phy_error_precise() while holding the lock
Move the locking out of phy_error_precise() and to its only call site,
merging with the locked region that has already been taken.
Tested-by: Jijie Shao <shaojijie@huawei.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/phy.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 1e5218935eb3..990d387b31bd 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -1231,9 +1231,7 @@ static void phy_error_precise(struct phy_device *phydev, const void *func, int err) { WARN(1, "%pS: returned: %d\n", func, err); - mutex_lock(&phydev->lock); phy_process_error(phydev); - mutex_unlock(&phydev->lock); } /** @@ -1503,10 +1501,10 @@ void phy_state_machine(struct work_struct *work) if (err == -ENODEV) return; + mutex_lock(&phydev->lock); if (err < 0) phy_error_precise(phydev, func, err); - mutex_lock(&phydev->lock); phy_process_state_change(phydev, old_state); /* Only re-schedule a PHY state machine change if we are polling the |