net: mdiobus: Remove WARN_ON_ONCE(in_interrupt()) (85bdebd1) · Commits · 戴 / test

in_interrupt() is ill defined and does not provide what the name suggests. The usage especially in driver code is deprecated and a tree wide effort to clean up and consolidate the (ab)usage of in_interrupt() and related checks is happening. In this case the check covers only parts of the contexts in which these functions cannot be called. It fails to detect preemption or interrupt disabled invocations. As the functions which contain these warnings invoke mutex_lock() which contains a broad variety of checks (always enabled or debug option dependent) and therefore covers all invalid conditions already, there is no point in having inconsistent warnings in those drivers. The conditional return is not really valuable in practice either. Just remove them. Signed-off-by:

Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by:

Thomas Gleixner <tglx@linutronix.de> Reviewed-by:

Andrew Lunn <andrew@lunn.ch> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/phy/mdio_bus.c

+0 −15

Original line number	Diff line number	Diff line
		@@ -825,9 +825,6 @@ int mdiobus_read_nested(struct mii_bus *bus, int addr, u32 regnum)
		{
		int retval;

		if (WARN_ON_ONCE(in_interrupt()))
		return -EINVAL;

		mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
		retval = __mdiobus_read(bus, addr, regnum);
		mutex_unlock(&bus->mdio_lock);
		@@ -850,9 +847,6 @@ int mdiobus_read(struct mii_bus *bus, int addr, u32 regnum)
		{
		int retval;

		if (WARN_ON_ONCE(in_interrupt()))
		return -EINVAL;

		mutex_lock(&bus->mdio_lock);
		retval = __mdiobus_read(bus, addr, regnum);
		mutex_unlock(&bus->mdio_lock);
		@@ -879,9 +873,6 @@ int mdiobus_write_nested(struct mii_bus *bus, int addr, u32 regnum, u16 val)
		{
		int err;

		if (WARN_ON_ONCE(in_interrupt()))
		return -EINVAL;

		mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
		err = __mdiobus_write(bus, addr, regnum, val);
		mutex_unlock(&bus->mdio_lock);
		@@ -905,9 +896,6 @@ int mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val)
		{
		int err;

		if (WARN_ON_ONCE(in_interrupt()))
		return -EINVAL;

		mutex_lock(&bus->mdio_lock);
		err = __mdiobus_write(bus, addr, regnum, val);
		mutex_unlock(&bus->mdio_lock);
		@@ -929,9 +917,6 @@ int mdiobus_modify(struct mii_bus *bus, int addr, u32 regnum, u16 mask, u16 set)
		{
		int err;

		if (WARN_ON_ONCE(in_interrupt()))
		return -EINVAL;

		mutex_lock(&bus->mdio_lock);
		err = __mdiobus_modify_changed(bus, addr, regnum, mask, set);
		mutex_unlock(&bus->mdio_lock);

Admin message