Commit 89e3e3dd authored by Russell King's avatar Russell King Committed by David S. Miller

net: mdiobus: avoid BUG_ON() in mdiobus accessors

Avoid using BUG_ON() in the mdiobus accessors, prefering instead to use
WARN_ON_ONCE() and returning an error.
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 54e1dc70
...@@ -841,7 +841,8 @@ int mdiobus_read_nested(struct mii_bus *bus, int addr, u32 regnum) ...@@ -841,7 +841,8 @@ int mdiobus_read_nested(struct mii_bus *bus, int addr, u32 regnum)
{ {
int retval; int retval;
BUG_ON(in_interrupt()); if (WARN_ON_ONCE(in_interrupt()))
return -EINVAL;
mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED); mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
retval = __mdiobus_read(bus, addr, regnum); retval = __mdiobus_read(bus, addr, regnum);
...@@ -865,7 +866,8 @@ int mdiobus_read(struct mii_bus *bus, int addr, u32 regnum) ...@@ -865,7 +866,8 @@ int mdiobus_read(struct mii_bus *bus, int addr, u32 regnum)
{ {
int retval; int retval;
BUG_ON(in_interrupt()); if (WARN_ON_ONCE(in_interrupt()))
return -EINVAL;
mutex_lock(&bus->mdio_lock); mutex_lock(&bus->mdio_lock);
retval = __mdiobus_read(bus, addr, regnum); retval = __mdiobus_read(bus, addr, regnum);
...@@ -893,7 +895,8 @@ int mdiobus_write_nested(struct mii_bus *bus, int addr, u32 regnum, u16 val) ...@@ -893,7 +895,8 @@ int mdiobus_write_nested(struct mii_bus *bus, int addr, u32 regnum, u16 val)
{ {
int err; int err;
BUG_ON(in_interrupt()); if (WARN_ON_ONCE(in_interrupt()))
return -EINVAL;
mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED); mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
err = __mdiobus_write(bus, addr, regnum, val); err = __mdiobus_write(bus, addr, regnum, val);
...@@ -918,7 +921,8 @@ int mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val) ...@@ -918,7 +921,8 @@ int mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val)
{ {
int err; int err;
BUG_ON(in_interrupt()); if (WARN_ON_ONCE(in_interrupt()))
return -EINVAL;
mutex_lock(&bus->mdio_lock); mutex_lock(&bus->mdio_lock);
err = __mdiobus_write(bus, addr, regnum, val); err = __mdiobus_write(bus, addr, regnum, val);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment