linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] net: dsa: mv88e6xxx: global2: Fix gcc compile error
@ 2019-11-07 12:26 Chen Wandun
  2019-11-07 13:10 ` Andrew Lunn
  0 siblings, 1 reply; 2+ messages in thread
From: Chen Wandun @ 2019-11-07 12:26 UTC (permalink / raw)
  To: andrew, vivien.didelot, f.fainelli, davem, netdev, linux-kernel
  Cc: chenwandun

In commit c5f299d59261 ("net: dsa: mv88e6xxx: global1_atu: Add helper for
get next"), it add a parameter in mv88e6xxx_g2_atu_stats_get only when
CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 enabled, it also should make the same
change when CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 disabled.

drivers/net/dsa/mv88e6xxx/chip.c: In function mv88e6xxx_devlink_atu_bin_get:
drivers/net/dsa/mv88e6xxx/chip.c:2752:8: error: too many arguments to function mv88e6xxx_g2_atu_stats_get
  err = mv88e6xxx_g2_atu_stats_get(chip, &occupancy);
        ^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/net/dsa/mv88e6xxx/chip.c:36:0:
drivers/net/dsa/mv88e6xxx/global2.h:535:19: note: declared here
 static inline int mv88e6xxx_g2_atu_stats_get(struct mv88e6xxx_chip *chip)
                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
make[4]: *** [drivers/net/dsa/mv88e6xxx/chip.o] Error 1

Fixes: c5f299d59261 ("net: dsa: mv88e6xxx: global1_atu: Add helper for get next")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Chen Wandun <chenwandun@huawei.com>
---
 drivers/net/dsa/mv88e6xxx/global2.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/dsa/mv88e6xxx/global2.h b/drivers/net/dsa/mv88e6xxx/global2.h
index d80ad20..1f42ee6 100644
--- a/drivers/net/dsa/mv88e6xxx/global2.h
+++ b/drivers/net/dsa/mv88e6xxx/global2.h
@@ -532,7 +532,8 @@ static inline int mv88e6xxx_g2_atu_stats_set(struct mv88e6xxx_chip *chip,
 	return -EOPNOTSUPP;
 }
 
-static inline int mv88e6xxx_g2_atu_stats_get(struct mv88e6xxx_chip *chip)
+static inline int mv88e6xxx_g2_atu_stats_get(struct mv88e6xxx_chip *chip,
+					     u16 *stats)
 {
 	return -EOPNOTSUPP;
 }
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] net: dsa: mv88e6xxx: global2: Fix gcc compile error
  2019-11-07 12:26 [PATCH] net: dsa: mv88e6xxx: global2: Fix gcc compile error Chen Wandun
@ 2019-11-07 13:10 ` Andrew Lunn
  0 siblings, 0 replies; 2+ messages in thread
From: Andrew Lunn @ 2019-11-07 13:10 UTC (permalink / raw)
  To: Chen Wandun; +Cc: vivien.didelot, f.fainelli, davem, netdev, linux-kernel

On Thu, Nov 07, 2019 at 08:26:07PM +0800, Chen Wandun wrote:
> In commit c5f299d59261 ("net: dsa: mv88e6xxx: global1_atu: Add helper for
> get next"), it add a parameter in mv88e6xxx_g2_atu_stats_get only when
> CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 enabled, it also should make the same
> change when CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 disabled.

Hi Chen

Thanks for the report. A fix was merged last night.

       Andrew

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-11-07 13:10 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-07 12:26 [PATCH] net: dsa: mv88e6xxx: global2: Fix gcc compile error Chen Wandun
2019-11-07 13:10 ` Andrew Lunn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).