These checks are relevant during development / testing only,
therefore switch to lockdep_assert_held and friends.

Signed-off-by: Heiner Kallweit <hkallwe...@gmail.com>
---
 drivers/net/phy/mdio_bus.c   | 4 ++--
 drivers/net/phy/phy.c        | 2 +-
 drivers/net/phy/phy_device.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 2e59a8419..5cb06f021 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -541,7 +541,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);
 
@@ -566,7 +566,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 083977d2f..b0b3c9ac4 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -514,7 +514,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);
 
        err = phy_read_status(phydev);
        if (err)
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 0f56d408b..1c20a0df3 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1340,7 +1340,7 @@ int __phy_resume(struct phy_device *phydev)
        struct phy_driver *phydrv = to_phy_driver(phydev->mdio.dev.driver);
        int ret = 0;
 
-       WARN_ON(!mutex_is_locked(&phydev->lock));
+       lockdep_assert_held(&phydev->lock);
 
        if (phydev->drv && phydrv->resume)
                ret = phydrv->resume(phydev);
-- 
2.19.1

Reply via email to