net: phy: replace mutex_is_locked with lockdep_assert_held in phylib

Switch to lockdep_assert_held(_once), similar to what is being done
in other subsystems. One advantage is that there's zero runtime
overhead if lockdep support isn't enabled.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/ccc40b9d-8ee0-43a1-5009-2cc95ca79c85@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 2b42e46066b44e35d40ab9f0bf3f7c2afd4eb30d..040509b81f02a17b66684d2dc7918a3ce84f83c9 100644 (file)
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -740,7 +740,7 @@ int __mdiobus_read(struct mii_bus *bus, int addr, u32 regnum)
 {
        int retval;
 
-       WARN_ON_ONCE(!mutex_is_locked(&bus->mdio_lock));
+       lockdep_assert_held_once(&bus->mdio_lock);
 
        retval = bus->read(bus, addr, regnum);
 
@@ -766,7 +766,7 @@ int __mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val)
 {
        int err;
 
-       WARN_ON_ONCE(!mutex_is_locked(&bus->mdio_lock));
+       lockdep_assert_held_once(&bus->mdio_lock);
 
        err = bus->write(bus, addr, regnum, val);
 

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 45f75533c47cec6bf80ad04ebadc2959bd804689..9cb7e4dbf8f4515deb907b6b1cfc185ef59d5cd5 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -724,7 +724,7 @@ static int phy_check_link_status(struct phy_device *phydev)
 {
        int err;
 
-       WARN_ON(!mutex_is_locked(&phydev->lock));
+       lockdep_assert_held(&phydev->lock);
 
        /* Keep previous state if loopback is enabled because some PHYs
         * report that Link is Down when loopback is enabled.

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 80c2e646c09343114ec1dd322bade6b65ddb69ee..8447e56ba572483c86d05e1d69ceeb3cfb71fcf6 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1740,7 +1740,7 @@ int __phy_resume(struct phy_device *phydev)
        struct phy_driver *phydrv = phydev->drv;
        int ret;
 
-       WARN_ON(!mutex_is_locked(&phydev->lock));
+       lockdep_assert_held(&phydev->lock);
 
        if (!phydrv || !phydrv->resume)
                return 0;