Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0505610 authored by Neil Armstrong's avatar Neil Armstrong Committed by David S. Miller
Browse files

net: dsa: Make mv88e6060 use nested mdiobus read/write 



Like mv88e6xxx and mdio-mux, to avoid lockdep give false positives
because of nested MDIO busses, switch to previously introduced
nested mdiobus_read/write variants.

Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e899e6c

drivers/net/dsa/mv88e6060.c

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static int reg_read(struct dsa_switch *ds, int addr, int reg) 
	if (bus == NULL)

		return -EINVAL;



	return mdiobus_read(bus, ds->pd->sw_addr + addr, reg);

	return mdiobus_read_nested(bus, ds->pd->sw_addr + addr, reg);

}



#define REG_READ(addr, reg)					\
@@ -47,7 +47,7 @@ static int reg_write(struct dsa_switch *ds, int addr, int reg, u16 val) 
	if (bus == NULL)

		return -EINVAL;



	return mdiobus_write(bus, ds->pd->sw_addr + addr, reg, val);

	return mdiobus_write_nested(bus, ds->pd->sw_addr + addr, reg, val);

}



#define REG_WRITE(addr, reg, val)				\