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

superna9999 · davem330 · commit f0505610505c · 2015-10-23T05:57:45.000-07:00
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: Neil Armstrong &lt;narmstrong@baylibre.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c
@@ -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)				\

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ static int reg_read(struct dsa_switch *ds, int addr, int reg)`
`26`	`26`	`if (bus == NULL)`
`27`	`27`	`return -EINVAL;`
`28`	`28`
`29`		`- return mdiobus_read(bus, ds->pd->sw_addr + addr, reg);`
	`29`	`+ return mdiobus_read_nested(bus, ds->pd->sw_addr + addr, reg);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`#define REG_READ(addr, reg) \`
`@@ -47,7 +47,7 @@ static int reg_write(struct dsa_switch *ds, int addr, int reg, u16 val)`
`47`	`47`	`if (bus == NULL)`
`48`	`48`	`return -EINVAL;`
`49`	`49`
`50`		`- return mdiobus_write(bus, ds->pd->sw_addr + addr, reg, val);`
	`50`	`+ return mdiobus_write_nested(bus, ds->pd->sw_addr + addr, reg, val);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`#define REG_WRITE(addr, reg, val) \`