Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Heiner Kallweit and committed by
Jakub Kicinski
e6e918d4 8b86850b

+4 -4
+2 -2
drivers/net/phy/mdio_bus.c
··· 740 740 { 741 741 int retval; 742 742 743 - WARN_ON_ONCE(!mutex_is_locked(&bus->mdio_lock)); 743 + lockdep_assert_held_once(&bus->mdio_lock); 744 744 745 745 retval = bus->read(bus, addr, regnum); 746 746 ··· 766 766 { 767 767 int err; 768 768 769 - WARN_ON_ONCE(!mutex_is_locked(&bus->mdio_lock)); 769 + lockdep_assert_held_once(&bus->mdio_lock); 770 770 771 771 err = bus->write(bus, addr, regnum, val); 772 772
+1 -1
drivers/net/phy/phy.c
··· 724 724 { 725 725 int err; 726 726 727 - WARN_ON(!mutex_is_locked(&phydev->lock)); 727 + lockdep_assert_held(&phydev->lock); 728 728 729 729 /* Keep previous state if loopback is enabled because some PHYs 730 730 * report that Link is Down when loopback is enabled.
+1 -1
drivers/net/phy/phy_device.c
··· 1740 1740 struct phy_driver *phydrv = phydev->drv; 1741 1741 int ret; 1742 1742 1743 - WARN_ON(!mutex_is_locked(&phydev->lock)); 1743 + lockdep_assert_held(&phydev->lock); 1744 1744 1745 1745 if (!phydrv || !phydrv->resume) 1746 1746 return 0;