Commit e6e918d4 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jakub Kicinski
Browse files

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/ccc40b9d-8ee0-43a1-5009-2cc95ca79c85@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8b86850b

drivers/net/phy/mdio_bus.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/phy/phy.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

drivers/net/phy/phy_device.c

+1 −1
Original line number Diff line number Diff line
@@ -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;