nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net: phy: call phy_error_precise() while holding the lock

Browse source 
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>
This commit is contained in:
Russell King (Oracle) 2023-09-14 16:35:36 +01:00 committed by David S. Miller
parent 8da77df649
commit ef113a60d0
1 changed files with 1 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/phy/phy.c
View file

@ -1231,9 +1231,7 @@ static void phy_error_precise(struct phy_device *phydev,
const void *func, int err) const void *func, int err)
{ {
WARN(1, "%pS: returned: %d\n", func, err); WARN(1, "%pS: returned: %d\n", func, err);
mutex_lock(&phydev->lock);
phy_process_error(phydev); phy_process_error(phydev);
mutex_unlock(&phydev->lock);
} }
/** /**
@ -1503,10 +1501,10 @@ void phy_state_machine(struct work_struct *work)
if (err == -ENODEV) if (err == -ENODEV)
return; return;
mutex_lock(&phydev->lock);
if (err < 0) if (err < 0)
phy_error_precise(phydev, func, err); phy_error_precise(phydev, func, err);
mutex_lock(&phydev->lock);
phy_process_state_change(phydev, old_state); phy_process_state_change(phydev, old_state);
/* Only re-schedule a PHY state machine change if we are polling the /* Only re-schedule a PHY state machine change if we are polling the