* [PATCH ethtool 1/7] rename maybe_unused macro to __maybe_unused
2020-08-03 11:57 [PATCH ethtool 0/7] compiler warnings cleanup, part 1 Michal Kubecek
@ 2020-08-03 11:57 ` Michal Kubecek
2020-08-03 11:57 ` [PATCH ethtool 2/7] cable_test: clean up unused parameters Michal Kubecek
` (6 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Michal Kubecek @ 2020-08-03 11:57 UTC (permalink / raw)
To: netdev
This makes the code consistent with kernel and also makes it a bit more
apparent that it is an attribute.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
---
amd8111e.c | 2 +-
at76c50x-usb.c | 2 +-
de2104x.c | 4 ++--
dsa.c | 2 +-
e100.c | 2 +-
e1000.c | 2 +-
et131x.c | 2 +-
ethtool.c | 6 +++---
fec.c | 2 +-
fec_8xx.c | 2 +-
fjes.c | 2 +-
ibm_emac.c | 2 +-
igb.c | 2 +-
internal.h | 2 +-
ixgb.c | 2 +-
ixgbe.c | 2 +-
ixgbevf.c | 2 +-
lan78xx.c | 2 +-
marvell.c | 4 ++--
natsemi.c | 4 ++--
realtek.c | 2 +-
sfc.c | 3 ++-
smsc911x.c | 2 +-
stmmac.c | 4 ++--
tg3.c | 4 ++--
tse.c | 2 +-
vioc.c | 2 +-
vmxnet3.c | 2 +-
28 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/amd8111e.c b/amd8111e.c
index 5a056b3f84ca..175516bd2904 100644
--- a/amd8111e.c
+++ b/amd8111e.c
@@ -152,7 +152,7 @@ typedef enum {
#define PHY_SPEED_100 0x3
-int amd8111e_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int amd8111e_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
diff --git a/at76c50x-usb.c b/at76c50x-usb.c
index 0121e9886b65..fad41bf5fe25 100644
--- a/at76c50x-usb.c
+++ b/at76c50x-usb.c
@@ -12,7 +12,7 @@ static char *hw_versions[] = {
" 505AMX",
};
-int at76c50x_usb_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int at76c50x_usb_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
u8 version = (u8)(regs->version >> 24);
diff --git a/de2104x.c b/de2104x.c
index cc03533d1548..190422fb2249 100644
--- a/de2104x.c
+++ b/de2104x.c
@@ -111,7 +111,7 @@ print_rx_missed(u32 csr8)
}
}
-static void de21040_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+static void de21040_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
u32 tmp, v, *data = (u32 *)regs->data;
@@ -417,7 +417,7 @@ static void de21040_dump_regs(struct ethtool_drvinfo *info maybe_unused,
v & (1<<0) ? " Jabber disable\n" : "");
}
-static void de21041_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+static void de21041_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
u32 tmp, v, *data = (u32 *)regs->data;
diff --git a/dsa.c b/dsa.c
index 0071769861c3..65502a899194 100644
--- a/dsa.c
+++ b/dsa.c
@@ -870,7 +870,7 @@ static int dsa_mv88e6xxx_dump_regs(struct ethtool_regs *regs)
#undef FIELD
#undef REG
-int dsa_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int dsa_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
/* DSA per-driver register dump */
diff --git a/e100.c b/e100.c
index 540ae3544faf..fd4bd031a4a6 100644
--- a/e100.c
+++ b/e100.c
@@ -36,7 +36,7 @@
#define CU_CMD 0x00F0
#define RU_CMD 0x0007
-int e100_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int e100_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
u32 *regs_buff = (u32 *)regs->data;
diff --git a/e1000.c b/e1000.c
index 91e5bc14afe5..dbd6eb55a92c 100644
--- a/e1000.c
+++ b/e1000.c
@@ -363,7 +363,7 @@ static enum e1000_mac_type e1000_get_mac_type(u16 device_id)
return mac_type;
}
-int e1000_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int e1000_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
u32 *regs_buff = (u32 *)regs->data;
diff --git a/et131x.c b/et131x.c
index 1b0607177e6d..a23f7a27091c 100644
--- a/et131x.c
+++ b/et131x.c
@@ -2,7 +2,7 @@
#include <string.h>
#include "internal.h"
-int et131x_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int et131x_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
u8 version = (u8)(regs->version >> 24);
diff --git a/ethtool.c b/ethtool.c
index 1b99ac91dcbf..0f312bdae2bb 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -366,7 +366,7 @@ static int rxflow_str_to_type(const char *str)
return flow_type;
}
-static int do_version(struct cmd_context *ctx maybe_unused)
+static int do_version(struct cmd_context *ctx __maybe_unused)
{
fprintf(stdout,
PACKAGE " version " VERSION
@@ -1106,7 +1106,7 @@ nested:
}
static int dump_eeprom(int geeprom_dump_raw,
- struct ethtool_drvinfo *info maybe_unused,
+ struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_eeprom *ee)
{
if (geeprom_dump_raw) {
@@ -5708,7 +5708,7 @@ static const struct option args[] = {
{}
};
-static int show_usage(struct cmd_context *ctx maybe_unused)
+static int show_usage(struct cmd_context *ctx __maybe_unused)
{
int i;
diff --git a/fec.c b/fec.c
index 22bc09f982a0..9cb4f8b1d4e1 100644
--- a/fec.c
+++ b/fec.c
@@ -194,7 +194,7 @@ static void fec_dump_reg_v2(int reg, u32 val)
#undef FIELD
#undef REG
-int fec_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int fec_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
const u32 *data = (u32 *)regs->data;
diff --git a/fec_8xx.c b/fec_8xx.c
index 02ecaef84364..63352fca36b8 100644
--- a/fec_8xx.c
+++ b/fec_8xx.c
@@ -47,7 +47,7 @@ struct fec {
(unsigned long)(offsetof(struct fec, x)), \
#x, f->x)
-int fec_8xx_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int fec_8xx_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
struct fec *f = (struct fec *)regs->data;
diff --git a/fjes.c b/fjes.c
index 4c5f6bc70843..05bd24511fb7 100644
--- a/fjes.c
+++ b/fjes.c
@@ -2,7 +2,7 @@
#include <stdio.h>
#include "internal.h"
-int fjes_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int fjes_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
u32 *regs_buff = (u32 *)regs->data;
diff --git a/ibm_emac.c b/ibm_emac.c
index 3259c175a43a..ea01d56f609c 100644
--- a/ibm_emac.c
+++ b/ibm_emac.c
@@ -314,7 +314,7 @@ static void *print_tah_regs(void *buf)
return p + 1;
}
-int ibm_emac_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int ibm_emac_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
struct emac_ethtool_regs_hdr *hdr =
diff --git a/igb.c b/igb.c
index 89b5cdb5d689..f358f53b74e0 100644
--- a/igb.c
+++ b/igb.c
@@ -88,7 +88,7 @@
#define E1000_TCTL_RTLC 0x01000000 /* Re-transmit on late collision */
#define E1000_TCTL_NRTU 0x02000000 /* No Re-transmit on underrun */
-int igb_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int igb_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
u32 *regs_buff = (u32 *)regs->data;
diff --git a/internal.h b/internal.h
index 1c6689a29c81..8ae1efab5b5c 100644
--- a/internal.h
+++ b/internal.h
@@ -26,7 +26,7 @@
#include "json_writer.h"
#include "json_print.h"
-#define maybe_unused __attribute__((__unused__))
+#define __maybe_unused __attribute__((__unused__))
/* internal for netlink interface */
#ifdef ETHTOOL_ENABLE_NETLINK
diff --git a/ixgb.c b/ixgb.c
index 7c16c6e76d44..8aec9a9d2258 100644
--- a/ixgb.c
+++ b/ixgb.c
@@ -38,7 +38,7 @@
#define IXGB_RAH_ASEL_SRC 0x00010000
#define IXGB_RAH_AV 0x80000000
-int ixgb_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int ixgb_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
u32 *regs_buff = (u32 *)regs->data;
diff --git a/ixgbe.c b/ixgbe.c
index 9754b2ad078f..6d509c87f357 100644
--- a/ixgbe.c
+++ b/ixgbe.c
@@ -168,7 +168,7 @@ ixgbe_get_mac_type(u16 device_id)
}
int
-ixgbe_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+ixgbe_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
u32 *regs_buff = (u32 *)regs->data;
diff --git a/ixgbevf.c b/ixgbevf.c
index 265e0bf740b3..91c2b2cd4f3c 100644
--- a/ixgbevf.c
+++ b/ixgbevf.c
@@ -3,7 +3,7 @@
#include "internal.h"
int
-ixgbevf_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+ixgbevf_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
u32 *regs_buff = (u32 *)regs->data;
diff --git a/lan78xx.c b/lan78xx.c
index 46ade1c417f9..75ee0487d5fc 100644
--- a/lan78xx.c
+++ b/lan78xx.c
@@ -2,7 +2,7 @@
#include <string.h>
#include "internal.h"
-int lan78xx_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int lan78xx_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
unsigned int *lan78xx_reg = (unsigned int *)regs->data;
diff --git a/marvell.c b/marvell.c
index 9e5440d73c12..8afb150327a3 100644
--- a/marvell.c
+++ b/marvell.c
@@ -259,7 +259,7 @@ static void dump_control(u8 *r)
printf("General Purpose I/O 0x%08X\n", *(u32 *) (r + 0x15c));
}
-int skge_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int skge_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
const u32 *r = (const u32 *) regs->data;
@@ -380,7 +380,7 @@ static void dump_prefetch(const char *name, const void *r)
}
}
-int sky2_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int sky2_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
const u16 *r16 = (const u16 *) regs->data;
diff --git a/natsemi.c b/natsemi.c
index ce82c426c178..0af465959cbc 100644
--- a/natsemi.c
+++ b/natsemi.c
@@ -323,7 +323,7 @@ static void __print_intr(int d, int intr, const char *name,
} while (0)
int
-natsemi_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+natsemi_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
u32 *data = (u32 *)regs->data;
@@ -964,7 +964,7 @@ natsemi_dump_regs(struct ethtool_drvinfo *info maybe_unused,
}
int
-natsemi_dump_eeprom(struct ethtool_drvinfo *info maybe_unused,
+natsemi_dump_eeprom(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_eeprom *ee)
{
int i;
diff --git a/realtek.c b/realtek.c
index d10cfd41dc95..ee0c6119dafa 100644
--- a/realtek.c
+++ b/realtek.c
@@ -241,7 +241,7 @@ print_intr_bits(u16 mask)
}
int
-realtek_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+realtek_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
u32 *data = (u32 *) regs->data;
diff --git a/sfc.c b/sfc.c
index f56243d449ec..340800ee0fa0 100644
--- a/sfc.c
+++ b/sfc.c
@@ -3890,7 +3890,8 @@ print_complex_table(unsigned revision, const struct efx_nic_reg_table *table,
}
int
-sfc_dump_regs(struct ethtool_drvinfo *info maybe_unused, struct ethtool_regs *regs)
+sfc_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
+ struct ethtool_regs *regs)
{
const struct efx_nic_reg *reg;
const struct efx_nic_reg_table *table;
diff --git a/smsc911x.c b/smsc911x.c
index bafee21485cf..b64350460451 100644
--- a/smsc911x.c
+++ b/smsc911x.c
@@ -2,7 +2,7 @@
#include <string.h>
#include "internal.h"
-int smsc911x_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int smsc911x_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
unsigned int *smsc_reg = (unsigned int *)regs->data;
diff --git a/stmmac.c b/stmmac.c
index 98d905835e16..58471200cd80 100644
--- a/stmmac.c
+++ b/stmmac.c
@@ -18,7 +18,7 @@
#define GMAC_REG_NUM 55
#define GMAC_DMA_REG_NUM 23
-int st_mac100_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int st_mac100_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
int i;
@@ -51,7 +51,7 @@ int st_mac100_dump_regs(struct ethtool_drvinfo *info maybe_unused,
return 0;
}
-int st_gmac_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int st_gmac_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
int i;
diff --git a/tg3.c b/tg3.c
index 8698391f63ea..ac73b33ae4e3 100644
--- a/tg3.c
+++ b/tg3.c
@@ -4,7 +4,7 @@
#define TG3_MAGIC 0x669955aa
-int tg3_dump_eeprom(struct ethtool_drvinfo *info maybe_unused,
+int tg3_dump_eeprom(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_eeprom *ee)
{
int i;
@@ -23,7 +23,7 @@ int tg3_dump_eeprom(struct ethtool_drvinfo *info maybe_unused,
return 0;
}
-int tg3_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int tg3_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
int i;
diff --git a/tse.c b/tse.c
index e5241ee4c98e..fb00d218ab8a 100644
--- a/tse.c
+++ b/tse.c
@@ -25,7 +25,7 @@ bitset(u32 val, int bit)
return 0;
}
-int altera_tse_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int altera_tse_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
int i;
diff --git a/vioc.c b/vioc.c
index ef163ab499f0..c04a6dc092f9 100644
--- a/vioc.c
+++ b/vioc.c
@@ -11,7 +11,7 @@ struct regs_line {
#define VIOC_REGS_LINE_SIZE sizeof(struct regs_line)
-int vioc_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+int vioc_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
unsigned int i;
diff --git a/vmxnet3.c b/vmxnet3.c
index c97214511e93..68726825a8ca 100644
--- a/vmxnet3.c
+++ b/vmxnet3.c
@@ -3,7 +3,7 @@
#include "internal.h"
int
-vmxnet3_dump_regs(struct ethtool_drvinfo *info maybe_unused,
+vmxnet3_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
struct ethtool_regs *regs)
{
u32 *regs_buff = (u32 *)regs->data;
--
2.28.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH ethtool 2/7] cable_test: clean up unused parameters
2020-08-03 11:57 [PATCH ethtool 0/7] compiler warnings cleanup, part 1 Michal Kubecek
2020-08-03 11:57 ` [PATCH ethtool 1/7] rename maybe_unused macro to __maybe_unused Michal Kubecek
@ 2020-08-03 11:57 ` Michal Kubecek
2020-08-03 23:59 ` Andrew Lunn
2020-08-03 11:57 ` [PATCH ethtool 3/7] igc: mark unused callback parameter Michal Kubecek
` (5 subsequent siblings)
7 siblings, 1 reply; 11+ messages in thread
From: Michal Kubecek @ 2020-08-03 11:57 UTC (permalink / raw)
To: netdev
Functions nl_cable_test_ntf_attr() and nl_cable_test_tdr_ntf_attr() do not
use nlctx parameter and as they are not callbacks with fixed signature, we
can simply drop it. Once we do, the same is true for cable_test_ntf_nest()
and cable_test_tdr_ntf_nest().
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
---
netlink/cable_test.c | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/netlink/cable_test.c b/netlink/cable_test.c
index c2b9c97d1239..d39b7d82efb0 100644
--- a/netlink/cable_test.c
+++ b/netlink/cable_test.c
@@ -88,8 +88,7 @@ static char *nl_pair2txt(uint8_t pair)
}
}
-static int nl_cable_test_ntf_attr(struct nlattr *evattr,
- struct nl_context *nlctx)
+static int nl_cable_test_ntf_attr(struct nlattr *evattr)
{
unsigned int cm;
uint16_t code;
@@ -122,14 +121,13 @@ static int nl_cable_test_ntf_attr(struct nlattr *evattr,
return 0;
}
-static void cable_test_ntf_nest(const struct nlattr *nest,
- struct nl_context *nlctx)
+static void cable_test_ntf_nest(const struct nlattr *nest)
{
struct nlattr *pos;
int ret;
mnl_attr_for_each_nested(pos, nest) {
- ret = nl_cable_test_ntf_attr(pos, nlctx);
+ ret = nl_cable_test_ntf_attr(pos);
if (ret < 0)
return;
}
@@ -180,7 +178,7 @@ static int cable_test_ntf_stop_cb(const struct nlmsghdr *nlhdr, void *data)
}
if (tb[ETHTOOL_A_CABLE_TEST_NTF_NEST])
- cable_test_ntf_nest(tb[ETHTOOL_A_CABLE_TEST_NTF_NEST], nlctx);
+ cable_test_ntf_nest(tb[ETHTOOL_A_CABLE_TEST_NTF_NEST]);
if (status == ETHTOOL_A_CABLE_TEST_NTF_STATUS_COMPLETED) {
if (ctctx)
@@ -339,8 +337,7 @@ static int nl_get_cable_test_tdr_step(const struct nlattr *nest,
return 0;
}
-static int nl_cable_test_tdr_ntf_attr(struct nlattr *evattr,
- struct nl_context *nlctx)
+static int nl_cable_test_tdr_ntf_attr(struct nlattr *evattr)
{
uint32_t first, last, step;
uint8_t pair;
@@ -391,14 +388,13 @@ static int nl_cable_test_tdr_ntf_attr(struct nlattr *evattr,
return 0;
}
-static void cable_test_tdr_ntf_nest(const struct nlattr *nest,
- struct nl_context *nlctx)
+static void cable_test_tdr_ntf_nest(const struct nlattr *nest)
{
struct nlattr *pos;
int ret;
mnl_attr_for_each_nested(pos, nest) {
- ret = nl_cable_test_tdr_ntf_attr(pos, nlctx);
+ ret = nl_cable_test_tdr_ntf_attr(pos);
if (ret < 0)
return;
}
@@ -450,8 +446,7 @@ int cable_test_tdr_ntf_stop_cb(const struct nlmsghdr *nlhdr, void *data)
}
if (tb[ETHTOOL_A_CABLE_TEST_TDR_NTF_NEST])
- cable_test_tdr_ntf_nest(tb[ETHTOOL_A_CABLE_TEST_TDR_NTF_NEST],
- nlctx);
+ cable_test_tdr_ntf_nest(tb[ETHTOOL_A_CABLE_TEST_TDR_NTF_NEST]);
if (status == ETHTOOL_A_CABLE_TEST_NTF_STATUS_COMPLETED) {
if (ctctx)
--
2.28.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH ethtool 3/7] igc: mark unused callback parameter
2020-08-03 11:57 [PATCH ethtool 0/7] compiler warnings cleanup, part 1 Michal Kubecek
2020-08-03 11:57 ` [PATCH ethtool 1/7] rename maybe_unused macro to __maybe_unused Michal Kubecek
2020-08-03 11:57 ` [PATCH ethtool 2/7] cable_test: clean up unused parameters Michal Kubecek
@ 2020-08-03 11:57 ` Michal Kubecek
2020-08-03 11:57 ` [PATCH ethtool 4/7] netlink: " Michal Kubecek
` (4 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Michal Kubecek @ 2020-08-03 11:57 UTC (permalink / raw)
To: netdev
Mark info parameter of igc_dump_regs() as unused to get rid of gcc warning.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
---
igc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/igc.c b/igc.c
index 2c4abcef1e15..1550ac0c1c2b 100644
--- a/igc.c
+++ b/igc.c
@@ -94,7 +94,8 @@ static const char *bit_to_prio(u32 val)
return val ? "low" : "high";
}
-int igc_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
+int igc_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
+ struct ethtool_regs *regs)
{
u32 reg;
int offset, i;
--
2.28.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH ethtool 4/7] netlink: mark unused callback parameter
2020-08-03 11:57 [PATCH ethtool 0/7] compiler warnings cleanup, part 1 Michal Kubecek
` (2 preceding siblings ...)
2020-08-03 11:57 ` [PATCH ethtool 3/7] igc: mark unused callback parameter Michal Kubecek
@ 2020-08-03 11:57 ` Michal Kubecek
2020-08-03 11:57 ` [PATCH ethtool 5/7] netlink: mark unused parameters of bitset walker callbacks Michal Kubecek
` (3 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Michal Kubecek @ 2020-08-03 11:57 UTC (permalink / raw)
To: netdev
Function nomsg_reply_cb() is used as a callback for mnl_cb_run() but it
does not use its data parameter; mark it as unused to get rid of compiler
warning.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
---
netlink/netlink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/netlink/netlink.c b/netlink/netlink.c
index 17b7788600d0..76b6e825b1d0 100644
--- a/netlink/netlink.c
+++ b/netlink/netlink.c
@@ -16,7 +16,7 @@
/* Used as reply callback for requests where no reply is expected (e.g. most
* "set" type commands)
*/
-int nomsg_reply_cb(const struct nlmsghdr *nlhdr, void *data)
+int nomsg_reply_cb(const struct nlmsghdr *nlhdr, void *data __maybe_unused)
{
const struct genlmsghdr *ghdr = (const struct genlmsghdr *)(nlhdr + 1);
--
2.28.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH ethtool 5/7] netlink: mark unused parameters of bitset walker callbacks
2020-08-03 11:57 [PATCH ethtool 0/7] compiler warnings cleanup, part 1 Michal Kubecek
` (3 preceding siblings ...)
2020-08-03 11:57 ` [PATCH ethtool 4/7] netlink: " Michal Kubecek
@ 2020-08-03 11:57 ` Michal Kubecek
2020-08-03 11:57 ` [PATCH ethtool 6/7] netlink: mark unused parameters of parser callbacks Michal Kubecek
` (2 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Michal Kubecek @ 2020-08-03 11:57 UTC (permalink / raw)
To: netdev
Some callbacks used with walk_bitset() do not use all parameters passed to
them. Mark unused parameters explicitly to get rid of compiler warnings.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
---
netlink/pause.c | 3 ++-
netlink/privflags.c | 2 +-
netlink/settings.c | 9 ++++++---
netlink/tsinfo.c | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/netlink/pause.c b/netlink/pause.c
index 48215d29aa34..7b6b3a1d2c10 100644
--- a/netlink/pause.c
+++ b/netlink/pause.c
@@ -21,7 +21,8 @@ struct pause_autoneg_status {
bool asym_pause;
};
-static void pause_autoneg_walker(unsigned int idx, const char *name, bool val,
+static void pause_autoneg_walker(unsigned int idx,
+ const char *name __maybe_unused, bool val,
void *data)
{
struct pause_autoneg_status *status = data;
diff --git a/netlink/privflags.c b/netlink/privflags.c
index a06cd6d88d9d..299ccdc21581 100644
--- a/netlink/privflags.c
+++ b/netlink/privflags.c
@@ -19,7 +19,7 @@
/* PRIVFLAGS_GET */
static void privflags_maxlen_walk_cb(unsigned int idx, const char *name,
- bool val, void *data)
+ bool val __maybe_unused, void *data)
{
unsigned int *maxlen = data;
unsigned int len, n;
diff --git a/netlink/settings.c b/netlink/settings.c
index 726259d83702..17ef000ed812 100644
--- a/netlink/settings.c
+++ b/netlink/settings.c
@@ -656,7 +656,8 @@ int linkstate_reply_cb(const struct nlmsghdr *nlhdr, void *data)
return MNL_CB_OK;
}
-void wol_modes_cb(unsigned int idx, const char *name, bool val, void *data)
+void wol_modes_cb(unsigned int idx, const char *name __maybe_unused, bool val,
+ void *data)
{
struct ethtool_wolinfo *wol = data;
@@ -704,7 +705,8 @@ int wol_reply_cb(const struct nlmsghdr *nlhdr, void *data)
return MNL_CB_OK;
}
-void msgmask_cb(unsigned int idx, const char *name, bool val, void *data)
+void msgmask_cb(unsigned int idx, const char *name __maybe_unused, bool val,
+ void *data)
{
u32 *msg_mask = data;
@@ -714,7 +716,8 @@ void msgmask_cb(unsigned int idx, const char *name, bool val, void *data)
*msg_mask |= (1U << idx);
}
-void msgmask_cb2(unsigned int idx, const char *name, bool val, void *data)
+void msgmask_cb2(unsigned int idx __maybe_unused, const char *name,
+ bool val, void *data __maybe_unused)
{
if (val)
printf(" %s", name);
diff --git a/netlink/tsinfo.c b/netlink/tsinfo.c
index 03ce91cd4314..c6571ffc16ff 100644
--- a/netlink/tsinfo.c
+++ b/netlink/tsinfo.c
@@ -16,7 +16,7 @@
/* TSINFO_GET */
static void tsinfo_dump_cb(unsigned int idx, const char *name, bool val,
- void *data)
+ void *data __maybe_unused)
{
if (!val)
return;
--
2.28.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH ethtool 6/7] netlink: mark unused parameters of parser callbacks
2020-08-03 11:57 [PATCH ethtool 0/7] compiler warnings cleanup, part 1 Michal Kubecek
` (4 preceding siblings ...)
2020-08-03 11:57 ` [PATCH ethtool 5/7] netlink: mark unused parameters of bitset walker callbacks Michal Kubecek
@ 2020-08-03 11:57 ` Michal Kubecek
2020-08-03 11:57 ` [PATCH ethtool 7/7] ioctl: avoid zero length array warning in get_stringset() Michal Kubecek
2020-08-03 13:31 ` [PATCH ethtool 0/7] compiler warnings cleanup, part 1 Andrew Lunn
7 siblings, 0 replies; 11+ messages in thread
From: Michal Kubecek @ 2020-08-03 11:57 UTC (permalink / raw)
To: netdev
Some calbacks used with nl_parser() do not use all parameters passed to
them. Mark unused parameters explicitly to get rid of compiler warnings.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
---
netlink/parser.c | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/netlink/parser.c b/netlink/parser.c
index f152a8268f0b..395bd5743af9 100644
--- a/netlink/parser.c
+++ b/netlink/parser.c
@@ -155,8 +155,9 @@ static int lookup_u8(const char *arg, uint8_t *result,
/* Parser handler for a flag. Expects a name (with no additional argument),
* generates NLA_FLAG or sets a bool (if the name was present).
*/
-int nl_parse_flag(struct nl_context *nlctx, uint16_t type, const void *data,
- struct nl_msg_buff *msgbuff, void *dest)
+int nl_parse_flag(struct nl_context *nlctx __maybe_unused, uint16_t type,
+ const void *data __maybe_unused, struct nl_msg_buff *msgbuff,
+ void *dest)
{
if (dest)
*(bool *)dest = true;
@@ -166,7 +167,8 @@ int nl_parse_flag(struct nl_context *nlctx, uint16_t type, const void *data,
/* Parser handler for null terminated string. Expects a string argument,
* generates NLA_NUL_STRING or fills const char *
*/
-int nl_parse_string(struct nl_context *nlctx, uint16_t type, const void *data,
+int nl_parse_string(struct nl_context *nlctx, uint16_t type,
+ const void *data __maybe_unused,
struct nl_msg_buff *msgbuff, void *dest)
{
const char *arg = *nlctx->argp;
@@ -183,8 +185,8 @@ int nl_parse_string(struct nl_context *nlctx, uint16_t type, const void *data,
* (may use 0x prefix), generates NLA_U32 or fills an uint32_t.
*/
int nl_parse_direct_u32(struct nl_context *nlctx, uint16_t type,
- const void *data, struct nl_msg_buff *msgbuff,
- void *dest)
+ const void *data __maybe_unused,
+ struct nl_msg_buff *msgbuff, void *dest)
{
const char *arg = *nlctx->argp;
uint32_t val;
@@ -207,8 +209,8 @@ int nl_parse_direct_u32(struct nl_context *nlctx, uint16_t type,
* (may use 0x prefix), generates NLA_U32 or fills an uint32_t.
*/
int nl_parse_direct_u8(struct nl_context *nlctx, uint16_t type,
- const void *data, struct nl_msg_buff *msgbuff,
- void *dest)
+ const void *data __maybe_unused,
+ struct nl_msg_buff *msgbuff, void *dest)
{
const char *arg = *nlctx->argp;
uint8_t val;
@@ -231,8 +233,8 @@ int nl_parse_direct_u8(struct nl_context *nlctx, uint16_t type,
* NLA_U32 or fills an uint32_t.
*/
int nl_parse_direct_m2cm(struct nl_context *nlctx, uint16_t type,
- const void *data, struct nl_msg_buff *msgbuff,
- void *dest)
+ const void *data __maybe_unused,
+ struct nl_msg_buff *msgbuff, void *dest)
{
const char *arg = *nlctx->argp;
float meters;
@@ -256,7 +258,8 @@ int nl_parse_direct_m2cm(struct nl_context *nlctx, uint16_t type,
/* Parser handler for (tri-state) bool. Expects "name on|off", generates
* NLA_U8 which is 1 for "on" and 0 for "off".
*/
-int nl_parse_u8bool(struct nl_context *nlctx, uint16_t type, const void *data,
+int nl_parse_u8bool(struct nl_context *nlctx, uint16_t type,
+ const void *data __maybe_unused,
struct nl_msg_buff *msgbuff, void *dest)
{
const char *arg = *nlctx->argp;
@@ -463,8 +466,9 @@ err:
* error_parser_params (error message, return value and number of extra
* arguments to skip).
*/
-int nl_parse_error(struct nl_context *nlctx, uint16_t type, const void *data,
- struct nl_msg_buff *msgbuff, void *dest)
+int nl_parse_error(struct nl_context *nlctx, uint16_t type __maybe_unused,
+ const void *data, struct nl_msg_buff *msgbuff __maybe_unused,
+ void *dest __maybe_unused)
{
const struct error_parser_data *parser_data = data;
unsigned int skip = parser_data->extra_args;
--
2.28.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH ethtool 7/7] ioctl: avoid zero length array warning in get_stringset()
2020-08-03 11:57 [PATCH ethtool 0/7] compiler warnings cleanup, part 1 Michal Kubecek
` (5 preceding siblings ...)
2020-08-03 11:57 ` [PATCH ethtool 6/7] netlink: mark unused parameters of parser callbacks Michal Kubecek
@ 2020-08-03 11:57 ` Michal Kubecek
2020-08-03 13:31 ` [PATCH ethtool 0/7] compiler warnings cleanup, part 1 Andrew Lunn
7 siblings, 0 replies; 11+ messages in thread
From: Michal Kubecek @ 2020-08-03 11:57 UTC (permalink / raw)
To: netdev
Starting with gcc10, gcc issues a warning about accessing elements of
zero leghth arrays. This is usually fixed by using C99 variable length
arrays but struct ethtool_sset_info is part of kernel UAPI so use an
auxiliary pointer instead.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
---
ethtool.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ethtool.c b/ethtool.c
index 0f312bdae2bb..c4ad186cd390 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -1632,7 +1632,9 @@ get_stringset(struct cmd_context *ctx, enum ethtool_stringset set_id,
sset_info.hdr.reserved = 0;
sset_info.hdr.sset_mask = 1ULL << set_id;
if (send_ioctl(ctx, &sset_info) == 0) {
- len = sset_info.hdr.sset_mask ? sset_info.hdr.data[0] : 0;
+ const u32 *sset_lengths = sset_info.hdr.data;
+
+ len = sset_info.hdr.sset_mask ? sset_lengths[0] : 0;
} else if (errno == EOPNOTSUPP && drvinfo_offset != 0) {
/* Fallback for old kernel versions */
drvinfo.cmd = ETHTOOL_GDRVINFO;
--
2.28.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH ethtool 0/7] compiler warnings cleanup, part 1
2020-08-03 11:57 [PATCH ethtool 0/7] compiler warnings cleanup, part 1 Michal Kubecek
` (6 preceding siblings ...)
2020-08-03 11:57 ` [PATCH ethtool 7/7] ioctl: avoid zero length array warning in get_stringset() Michal Kubecek
@ 2020-08-03 13:31 ` Andrew Lunn
2020-08-03 13:53 ` Michal Kubecek
7 siblings, 1 reply; 11+ messages in thread
From: Andrew Lunn @ 2020-08-03 13:31 UTC (permalink / raw)
To: Michal Kubecek; +Cc: netdev
On Mon, Aug 03, 2020 at 01:57:03PM +0200, Michal Kubecek wrote:
> Maciej Żenczykowski recently cleaned up many "unused parameter" compiler
> warnings but some new occurences appeared since (mostly in netlink code).
Hi Michal
Could you modify the compiler flags to get gcc to warn about these?
Otherwise they will just come back again.
Andrew
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH ethtool 0/7] compiler warnings cleanup, part 1
2020-08-03 13:31 ` [PATCH ethtool 0/7] compiler warnings cleanup, part 1 Andrew Lunn
@ 2020-08-03 13:53 ` Michal Kubecek
0 siblings, 0 replies; 11+ messages in thread
From: Michal Kubecek @ 2020-08-03 13:53 UTC (permalink / raw)
To: Andrew Lunn; +Cc: netdev
On Mon, Aug 03, 2020 at 03:31:25PM +0200, Andrew Lunn wrote:
> On Mon, Aug 03, 2020 at 01:57:03PM +0200, Michal Kubecek wrote:
> > Maciej Żenczykowski recently cleaned up many "unused parameter" compiler
> > warnings but some new occurences appeared since (mostly in netlink code).
>
> Hi Michal
>
> Could you modify the compiler flags to get gcc to warn about these?
> Otherwise they will just come back again.
Good point. I'll add "-Wextra" to default CFLAGS in Makefile.am with the
second part of the cleanup (shortly after 5.8 release). At that point
there will be no warnings so that it will be easy to spot any new ones.
Michal
^ permalink raw reply [flat|nested] 11+ messages in thread