net: mscc: ocelot: remove incompatible prototypes
Subsystems (3)
PATCH 1/1 net: mscc: ocelot: remove incompatible prototypes
From: Arnd Bergmann <[email protected]>
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.
--- drivers/net/ethernet/mscc/ocelot.h | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/mscc/ocelot.h +0 -3
@@ -94,9 +94,6 @@ int ocelot_mact_forget(struct ocelot *ocelot,struct net_device *ocelot_port_to_netdev (struct ocelot *ocelot,int port);int ocelot_netdev_to_port (struct net_device *dev); -u32 ocelot_port_readl (struct ocelot_port *port,u32 reg); -void ocelot_port_writel (struct ocelot_port *port,u32 val,u32 reg); -int ocelot_probe_port (struct ocelot *ocelot,int port,struct regmap *target,struct device_node *portnp);void ocelot_release_port (struct ocelot_port *ocelot_port);
Signature · 1 line
2.39.2
Quoted 11 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
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 'unsignedint(struct ocelot_port *, unsigned int)'} [-Werror=enum-int-mismatch]97 | u32 ocelot_port_readl(struct ocelot_port *port, u32 reg); | ^~~~~~~~~~~~~~~~~
Quoted 6 lines
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 <[email protected]>---
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.
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 6 lines · On Mon, 17 Apr 2023 22:55:25 +0200 you wrote:
From: Arnd Bergmann <[email protected]>
The types for the register argument changed recently, but there are still incompatible prototypes that got left behind, and gcc-13 warns about these:
Quoted 6 lines
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 'unsignedint(struct ocelot_port *, unsigned int)'} [-Werror=enum-int-mismatch]97 | u32 ocelot_port_readl(struct ocelot_port *port, u32 reg); | ^~~~~~~~~~~~~~~~~[...]
Here is the summary with links:
- net: mscc: ocelot: remove incompatible prototypes
https://git.kernel.org/netdev/net-next/c/33d74c8ff5ce
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html