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>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 1e52189..990d387 100644 (file)
--- 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