Skip to content

Commit 33d74c8

Browse files
arndbkuba-moo
authored andcommitted
net: mscc: ocelot: remove incompatible prototypes
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: 9ecd057 ("net: mscc: ocelot: strengthen type of "u32 reg" in I/O accessors") Signed-off-by: Arnd Bergmann <[email protected]> Reviewed-by: Vladimir Oltean <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 6b2c6e4 commit 33d74c8

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

drivers/net/ethernet/mscc/ocelot.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ int ocelot_mact_forget(struct ocelot *ocelot,
9494
struct net_device *ocelot_port_to_netdev(struct ocelot *ocelot, int port);
9595
int ocelot_netdev_to_port(struct net_device *dev);
9696

97-
u32 ocelot_port_readl(struct ocelot_port *port, u32 reg);
98-
void ocelot_port_writel(struct ocelot_port *port, u32 val, u32 reg);
99-
10097
int ocelot_probe_port(struct ocelot *ocelot, int port, struct regmap *target,
10198
struct device_node *portnp);
10299
void ocelot_release_port(struct ocelot_port *ocelot_port);

0 commit comments

Comments
 (0)