net: mscc: ocelot: fix __ocelot_rmw_ix prototype
Subsystems (3)
PATCH 1/1 net: mscc: ocelot: fix __ocelot_rmw_ix prototype
The "read-modify-write register index" function is declared with a confusing prototype: the "mask" and "reg" arguments are swapped.
Fortunately, this does not affect callers so far. Both arguments are u32, and the wrapper macros (ocelot_rmw_ix etc) have the arguments in the correct order (the one from ocelot_io.c).
--- drivers/net/ethernet/mscc/ocelot.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mscc/ocelot.h +1 -1
@@ -525,7 +525,7 @@ void __ocelot_write_ix(struct ocelot *ocelot, u32 val, u32 reg, u32 offset);#define ocelot_write_rix (ocelot, val, reg, ri) __ocelot_write_ix(ocelot, val, reg, reg##_RSZ * (ri))#define ocelot_write (ocelot, val, reg) __ocelot_write_ix(ocelot, val, reg, 0) -void __ocelot_rmw_ix (struct ocelot *ocelot,u32 val,u32 reg,u32 mask, +void __ocelot_rmw_ix (struct ocelot *ocelot,u32 val,u32 mask,u32 reg,u32 offset);#define ocelot_rmw_ix (ocelot, val, m, reg, gi, ri) __ocelot_rmw_ix(ocelot, val, m, reg, reg##_GSZ * (gi) + reg##_RSZ * (ri))#define ocelot_rmw_gix (ocelot, val, m, reg, gi) __ocelot_rmw_ix(ocelot, val, m, reg, reg##_GSZ * (gi))
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Vladimir Oltean <[email protected]>
Date: Wed, 6 Nov 2019 00:01:40 +0200
Quoted 8 lines
The "read-modify-write register index" function is declared with a confusing prototype: the "mask" and "reg" arguments are swapped.
Fortunately, this does not affect callers so far. Both arguments are u32, and the wrapper macros (
ocelot_rmw_ixetc) have the arguments in the correct order (the one fromocelot_io.c).Signed-off-by Vladimir Oltean <[email protected]>
I ended up applying this to 'net' but will not queue it up for -stable.
Thank you.