Re: [PATCH] net: mscc: ocelot: remove incompatible prototypes

From: Vladimir Oltean
Date: Tue Apr 18 2023 - 12:17:35 EST


On Mon, Apr 17, 2023 at 10:55:25PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@xxxxxxxx>
>
> The types for the register argument changed recently, but there are
> still incompatible prototypes that got left behind, and gcc-13 warns
> about these:
>
> In file included from drivers/net/ethernet/mscc/ocelot.c:13:
> drivers/net/ethernet/mscc/ocelot.h:97:5: error: conflicting types for 'ocelot_port_readl' due to enum/integer mismatch; have 'u32(struct ocelot_port *, u32)' {aka 'unsigned int(struct ocelot_port *, unsigned int)'} [-Werror=enum-int-mismatch]
> 97 | u32 ocelot_port_readl(struct ocelot_port *port, u32 reg);
> | ^~~~~~~~~~~~~~~~~
>
> Just remove the two prototypes, and rely on the copy in the global
> header.
>
> Fixes: 9ecd05794b8d ("net: mscc: ocelot: strengthen type of "u32 reg" in I/O accessors")
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> ---

Interesting, I didn't even realize we had these duplicated there. Thanks.
FWIW, they were duplicated in commit 5e2563650232 ("net: mscc: ocelot:
publish structure definitions to include/soc/mscc/ocelot.h") and haven't
bothered anybody since then.

Reviewed-by: Vladimir Oltean <vladimir.oltean@xxxxxxx>