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

Commit 17fdd763 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

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).

Signed-off-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f8f3507

drivers/net/ethernet/mscc/ocelot.h

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,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))