Bunch of compiler warning fixes for ethtool.
Subsystems (3)
You can merge them via:
git fetch https://github.com/zenczykowski/ethtool.git fix-warnings git merge FETCH_HEAD
and I'll follow up this email with the full set.
PATCH 1/33 fix arithmetic on pointer to void is a GNU extension warning
From: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/marvell.c:127:22: error: arithmetic on a pointer to void is a GNU extension [-Werror,-Wpointer-arith] dump_timer("LED", p + 0x20);
(and remove some spare whitespace while we're at it)
--- marvell.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
marvell.c +7 -7
@@ -118,13 +118,13 @@ static void dump_fifo(const char *name, const void *p)printf ("\n%s\n" , name);printf ("---------------\n" );printf ("End Address 0x%08X\n" , r[0 ]); -printf ("Write Pointer 0x%08X\n" , r[1 ]); -printf ("Read Pointer 0x%08X\n" , r[2 ]); -printf ("Packet Counter 0x%08X\n" , r[3 ]); -printf ("Level 0x%08X\n" , r[4 ]); -printf ("Control 0x%08X\n" , r[5 ]); -printf ("Control/Test 0x%08X\n" , r[6 ]); -dump_timer ("LED" , p +0x20 ); +printf ("Write Pointer 0x%08X\n" , r[1 ]); +printf ("Read Pointer 0x%08X\n" , r[2 ]); +printf ("Packet Counter 0x%08X\n" , r[3 ]); +printf ("Level 0x%08X\n" , r[4 ]); +printf ("Control 0x%08X\n" , r[5 ]); +printf ("Control/Test 0x%08X\n" , r[6 ]); +dump_timer ("LED" , r +8 ); }static void dump_gmac_fifo (const char *name,const void *p)
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 2/33 fix unused parameter warnings in do_version() and show_usage()
From: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/ethtool.c:473:43: error: unused parameter 'ctx' [-Werror,-Wunused-parameter] static int do_version(struct cmd_context *ctx)
external/ethtool/ethtool.c:5392:43: error: unused parameter 'ctx' [-Werror,-Wunused-parameter] static int show_usage(struct cmd_context *ctx)
--- ethtool.c | 4 ++-- internal.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
ethtool.c +2 -2
@@ -470,7 +470,7 @@ static int rxflow_str_to_type(const char *str)return flow_type; } -static int do_version (struct cmd_context *ctx) +static int do_version(struct cmd_context *ctx maybe_unused) {fprintf (stdout, PACKAGE " version " VERSION
@@ -5484,7 +5484,7 @@ static const struct option { {} }; -static int show_usage (struct cmd_context *ctx) +static int show_usage(struct cmd_context *ctx maybe_unused) {int i;
internal.h +2 -0
@@ -23,6 +23,8 @@#include <sys/ioctl.h> #include <net/if.h> +#define maybe_unused __attribute__((__unused__)) +/* ethtool.h expects these to be defined by <linux/types.h> */ #ifndef HAVE_BE_TYPES typedef uint16_t __be16 ;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
Re: [PATCH 02/33] fix unused parameter warnings in do_version() and show_usage()
Quoted 21 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/ethtool.c:473:43: error: unused parameter 'ctx' [-Werror,-Wunused-parameter] static intdo_version(struct cmd_context *ctx)
external/ethtool/ethtool.c:5392:43: error: unused parameter 'ctx' [-Werror,-Wunused-parameter] static intshow_usage(struct cmd_context *ctx)Signed-off-by Maciej Żenczykowski <[email protected]>Change-Id I0cc52f33bb0e8d7627f5e84bb4e3dfa821d17cc8--- ethtool.c | 4 ++-- internal.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)ethtool.c +0
-0
ethtool.c static int rxflow_str_to_type(const char *str) · line 474
Quoted 6 lines
ethtool.c +1
-1@@ -470,7 +470,7 @@ static int rxflow_str_to_type(const char *str)return flow_type; } -static int do_version (struct cmd_context *ctx) +static int do_version(struct cmd_context *ctx maybe_unused) {
Considering how frequent this pattern (a callback where not all instances use all parameters) is, maybe we could consider disabling the warning with -Wno-unused-parameter instead of marking all places where it is issued.
Michal Kubecek
Quoted 27 lines
ethtool.c +1
-1fprintf (stdout, PACKAGE " version " VERSION@@ -5484,7 +5484,7 @@ static const struct option { {} }; -static int show_usage (struct cmd_context *ctx) +static int show_usage(struct cmd_context *ctx maybe_unused) {int i;internal.h +2
-0@@ -23,6 +23,8 @@#include <sys/ioctl.h> #include <net/if.h> +#define maybe_unused __attribute__((__unused__)) +/* ethtool.h expects these to be defined by <linux/types.h> */ #ifndef HAVE_BE_TYPES typedef uint16_t __be16 ;Signature · 1 line
2.23.0.866.gb869b98d4c-goog
Re: [PATCH 02/33] fix unused parameter warnings in do_version() and show_usage()
Quoted 4 lines
Considering how frequent this pattern (a callback where not all instances use all parameters) is, maybe we could consider disabling the warning with -Wno-unused-parameter instead of marking all places where it is issued.
Once you fix it... it stays fixed. There's no cost to carrying around the extra annotation.
And the warning still finds other places where you're doing it wrong.
PATCH 3/33 fix unused parameter warning in find_option()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/ethtool.c:5417:28: error: unused parameter 'argc' [-Werror,-Wunused-parameter] static int find_option(int argc, char **argp)
--- ethtool.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
ethtool.c +4 -5
@@ -5507,7 +5507,7 @@ static int show_usage(struct cmd_context *ctx maybe_unused)return 0 ; } -static int find_option (int argc,char **argp) +static int find_option (char *arg) {const char *opt;size_t len;
@@ -5517,8 +5517,7 @@ static int find_option(int argc, char **argp) opt = args[k].opts;for (;;) { len =strcspn (opt,"|" ); -if (strncmp (*argp, opt, len) ==0 && - (*argp)[len] ==0 ) +if (strncmp (arg, opt, len) ==0 && arg[len] ==0 )return k;if (opt[len] ==0 )
@@ -5667,7 +5666,7 @@ static int do_perqueue(struct cmd_context *ctx) ctx->argp++; } - i =find_option (ctx->argc, ctx->argp); + i =find_option (ctx->argp[0 ]);if (i <0 )exit_bad_args ();
@@ -5719,7 +5718,7 @@ int main(int argc, char **argp)if (argc ==0 )exit_bad_args (); - k =find_option (argc, argp); + k =find_option (*argp);if (k >=0 ) { argp++; argc--;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 4/33 fix unused parameter warning in dump_eeprom()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/ethtool.c:1271:70: error: unused parameter 'info' [-Werror,-Wunused-parameter] static int dump_eeprom(int geeprom_dump_raw, struct ethtool_drvinfo *info,
--- ethtool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
ethtool.c +2 -1
@@ -1275,7 +1275,8 @@ nested:return 0 ; } -static int dump_eeprom (int geeprom_dump_raw,struct ethtool_drvinfo *info, +static int dump_eeprom (int geeprom_dump_raw, + struct ethtool_drvinfo *info maybe_unused,struct ethtool_eeprom *ee) {if (geeprom_dump_raw) {
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 5/33 fix unused parameter warning in altera_tse_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/tse.c:28:50: error: unused parameter 'info' [-Werror,-Wunused-parameter] int altera_tse_dump_regs(struct ethtool_drvinfo *info,
--- tse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tse.c +1 -1
@@ -25,7 +25,7 @@ bitset(u32 val, int bit)return 0 ; } -int altera_tse_dump_regs (struct ethtool_drvinfo *info, +int altera_tse_dump_regs(struct ethtool_drvinfo *info maybe_unused,struct ethtool_regs *regs) {int i;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 6/33 fix unused parameter warning in sfc_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/sfc.c:3894:39: error: unused parameter 'info' [-Werror,-Wunused-parameter] sfc_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- sfc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sfc.c +1 -1
@@ -3891,7 +3891,7 @@ print_complex_table(unsigned revision, const struct efx_nic_reg_table *table, }int -sfc_dump_regs (struct ethtool_drvinfo *info,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;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 7/33 fix unused parameter warning in print_simple_table()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/sfc.c:3811:29: error: unused parameter 'revision' [-Werror,-Wunused-parameter] print_simple_table(unsigned revision, const struct efx_nic_reg_table *table,
--- sfc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
sfc.c +2 -3
@@ -3808,8 +3808,7 @@ print_single_register(unsigned revision, const struct efx_nic_reg *reg, }static const void * -print_simple_table (unsigned revision,const struct efx_nic_reg_table *table, -const void *buf) +print_simple_table (const struct efx_nic_reg_table *table,const void *buf) {const struct efx_nic_reg_field *field = &table->fields[0 ];size_t value_width = (field->width +3 ) >>2 ;
@@ -3918,7 +3917,7 @@ sfc_dump_regs(struct ethtool_drvinfo *info maybe_unused, struct ethtool_regs *re revision <= table->max_revision) {printf ("\n%s:\n" , table->name);if (table->field_count ==1 ) - buf =print_simple_table (revision, table, buf); + buf =print_simple_table (table, buf);else buf =print_complex_table (revision, table, buf); }
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 8/33 fix unused parameter warning in natsemi_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/natsemi.c:326:43: error: unused parameter 'info' [-Werror,-Wunused-parameter] natsemi_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- natsemi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
natsemi.c +2 -1
@@ -323,7 +323,8 @@ static void __print_intr(int d, int intr, const char *name, }while (0 ) int -natsemi_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs) +natsemi_dump_regs(struct ethtool_drvinfo *info maybe_unused, + struct ethtool_regs *regs) {u32 *data = (u32 *)regs->data;u32 tmp;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 9/33 fix unused parameter warning in netsemi_dump_eeprom()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/natsemi.c:967:45: error: unused parameter 'info' [-Werror,-Wunused-parameter] natsemi_dump_eeprom(struct ethtool_drvinfo *info, struct ethtool_eeprom *ee)
--- natsemi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
natsemi.c +2 -1
@@ -964,7 +964,8 @@ natsemi_dump_regs(struct ethtool_drvinfo *info maybe_unused, }int -natsemi_dump_eeprom (struct ethtool_drvinfo *info,struct ethtool_eeprom *ee) +natsemi_dump_eeprom(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_eeprom *ee) {int i;u16 *eebuf = (u16 *)ee->data;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 10/33 fix unused parameter warning in ixgbe_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/ixgbe.c:171:41: error: unused parameter 'info' [-Werror,-Wunused-parameter] ixgbe_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- ixgbe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
ixgbe.c +2 -1
@@ -168,7 +168,8 @@ ixgbe_get_mac_type(u16 device_id) }int -ixgbe_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +ixgbe_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {u32 *regs_buff = (u32 *)regs->data;u32 regs_buff_len = regs->len /sizeof (*regs_buff);
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 11/33 fix unused parameter warning in realtek_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/realtek.c:244:43: error: unused parameter 'info' [-Werror,-Wunused-parameter] realtek_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- realtek.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
realtek.c +2 -1
@@ -241,7 +241,8 @@ print_intr_bits(u16 mask) }int -realtek_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +realtek_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {u32 *data = (u32 *) regs->data;u8 *data8 = (u8 *) regs->data;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 12/33 fix unused parameter warning in lan78xx_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/lan78xx.c:5:47: error: unused parameter 'info' [-Werror,-Wunused-parameter] int lan78xx_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- lan78xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lan78xx.c +2 -1
@@ -2,7 +2,8 @@#include <string.h> #include "internal.h" -int lan78xx_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int lan78xx_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {unsigned int *lan78xx_reg = (unsigned int *)regs->data;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 13/33 fix unused parameter warning in {skge,sky2}_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/marvell.c:262:44: error: unused parameter 'info' [-Werror,-Wunused-parameter] int skge_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
external/ethtool/marvell.c:382:44: error: unused parameter 'info' [-Werror,-Wunused-parameter] int sky2_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- marvell.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
marvell.c +4 -2
@@ -259,7 +259,8 @@ 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,struct ethtool_regs *regs) +int skge_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {const u32 *r = (const u32 *) regs->data;int dual = !(regs->data[0x11a ] &1 );
@@ -379,7 +380,8 @@ static void dump_prefetch(const char *name, const void *r) } } -int sky2_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int sky2_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {const u16 *r16 = (const u16 *) regs->data;const u32 *r32 = (const u32 *) regs->data;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 14/33 fix unused parameter warning in dsa_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/dsa.c:677:43: error: unused parameter 'info' [-Werror,-Wunused-parameter] int dsa_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- dsa.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
dsa.c +2 -1
@@ -674,7 +674,8 @@ static int dsa_mv88e6xxx_dump_regs(struct ethtool_regs *regs)#undef FIELD#undef REG -int dsa_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int dsa_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {/* DSA per-driver register dump */ if (!dsa_mv88e6xxx_dump_regs (regs))
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 15/33 fix unused parameter warning in vmxnet3_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/vmxnet3.c:6:43: error: unused parameter 'info' [-Werror,-Wunused-parameter] vmxnet3_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- vmxnet3.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
vmxnet3.c +2 -1
@@ -3,7 +3,8 @@#include "internal.h" int -vmxnet3_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +vmxnet3_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {u32 *regs_buff = (u32 *)regs->data;u32 version = regs->version;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 16/33 fix unused parameter warning in st_{mac100,gmac}_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/stmmac.c:21:49: error: unused parameter 'info' [-Werror,-Wunused-parameter] int st_mac100_dump_regs(struct ethtool_drvinfo *info,
external/ethtool/stmmac.c:54:47: error: unused parameter 'info' [-Werror,-Wunused-parameter] int st_gmac_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- stmmac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
stmmac.c +3 -2
@@ -18,7 +18,7 @@#define GMAC_REG_NUM 55#define GMAC_DMA_REG_NUM 23 -int st_mac100_dump_regs (struct ethtool_drvinfo *info, +int st_mac100_dump_regs(struct ethtool_drvinfo *info maybe_unused,struct ethtool_regs *regs) {int i;
@@ -51,7 +51,8 @@ int st_mac100_dump_regs(struct ethtool_drvinfo *info,return 0 ; } -int st_gmac_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int st_gmac_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {int i;unsigned int *stmmac_reg = (unsigned int *)regs->data;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 17/33 fix unused parameter warning in ixgbevf_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/ixgbevf.c:6:43: error: unused parameter 'info' [-Werror,-Wunused-parameter] ixgbevf_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- ixgbevf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
ixgbevf.c +2 -1
@@ -3,7 +3,8 @@#include "internal.h" int -ixgbevf_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +ixgbevf_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {u32 *regs_buff = (u32 *)regs->data;u8 version = (u8)(regs->version >>24 );
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 18/33 fix unused parameter warning in fec_8xx_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/fec_8xx.c:50:47: error: unused parameter 'info' [-Werror,-Wunused-parameter] int fec_8xx_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- fec_8xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fec_8xx.c +2 -1
@@ -47,7 +47,8 @@ struct fec { (unsigned long)(offsetof(struct fec, x)), \#x , f->x) -int fec_8xx_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int fec_8xx_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {struct fec *f = (struct fec *)regs->data;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 19/33 fix unused parameter warning in tg3_dump_{eeprom,regs}()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/tg3.c:8:41: error: unused parameter 'info' [-Werror,-Wunused-parameter] tg3_dump_eeprom(struct ethtool_drvinfo *info, struct ethtool_eeprom *ee)
external/ethtool/tg3.c:27:39: error: unused parameter 'info' [-Werror,-Wunused-parameter] tg3_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- tg3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tg3.c +4 -4
@@ -4,8 +4,8 @@#define TG3_MAGIC 0x669955aa -int -tg3_dump_eeprom (struct ethtool_drvinfo *info,struct ethtool_eeprom *ee) +int tg3_dump_eeprom(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_eeprom *ee) {int i;
@@ -23,8 +23,8 @@ tg3_dump_eeprom(struct ethtool_drvinfo *info, struct ethtool_eeprom *ee)return 0 ; } -int -tg3_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int tg3_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {int i;u32 reg;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 20/33 fix unused parameter warning in vioc_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/vioc.c:14:44: error: unused parameter 'info' [-Werror,-Wunused-parameter] int vioc_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- vioc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
vioc.c +2 -1
@@ -11,7 +11,8 @@ struct regs_line {#define VIOC_REGS_LINE_SIZE sizeof(struct regs_line) -int vioc_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int vioc_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {unsigned int i;unsigned int num_regs;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 21/33 fix unused parameter warning in e100_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/e100.c:40:40: error: unused parameter 'info' [-Werror,-Wunused-parameter] e100_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- e100.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
e100.c +2 -2
@@ -36,8 +36,8 @@#define CU_CMD 0x00F0#define RU_CMD 0x0007 -int -e100_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int e100_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {u32 *regs_buff = (u32 *)regs->data;u8 version = (u8)(regs->version >>24 );
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 22/33 fix unused parameter warning in de2104[01]_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/de2104x.c:115:43: error: unused parameter 'info' [-Werror,-Wunused-parameter] de21040_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
external/ethtool/de2104x.c:421:43: error: unused parameter 'info' [-Werror,-Wunused-parameter] de21041_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- de2104x.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
de2104x.c +4 -4
@@ -111,8 +111,8 @@ print_rx_missed(u32 csr8) } } -static void -de21040_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +static void de21040_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {u32 tmp, v, *data = (u32 *)regs->data;
@@ -417,8 +417,8 @@ de21040_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs) v & (1<<0) ? " Jabber disable\n" : ""); } -static void -de21041_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +static void de21041_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {u32 tmp, v, *data = (u32 *)regs->data;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 23/33 fix unused parameter warning in igb_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/igb.c:92:39: error: unused parameter 'info' [-Werror,-Wunused-parameter] igb_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- igb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
igb.c +2 -2
@@ -88,8 +88,8 @@#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,struct ethtool_regs *regs) +int igb_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {u32 *regs_buff = (u32 *)regs->data;u32 reg;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 24/33 fix unused parameter warning in e1000_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/e1000.c:368:41: error: unused parameter 'info' [-Werror,-Wunused-parameter] e1000_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- e1000.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
e1000.c +2 -2
@@ -364,8 +364,8 @@ e1000_get_mac_type(u16 device_id, u8 revision_id)return mac_type; } -int -e1000_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int e1000_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {u32 *regs_buff = (u32 *)regs->data;u16 hw_device_id = (u16 )regs->version;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 25/33 fix unused parameter warning in smsc911x_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/smsc911x.c:5:48: error: unused parameter 'info' [-Werror,-Wunused-parameter] int smsc911x_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- smsc911x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
smsc911x.c +2 -1
@@ -2,7 +2,8 @@#include <string.h> #include "internal.h" -int smsc911x_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int smsc911x_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {unsigned int *smsc_reg = (unsigned int *)regs->data;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 26/33 fix unused parameter warning in at76c50x_usb_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/at76c50x-usb.c:16:48: error: unused parameter 'info' [-Werror,-Wunused-parameter] at76c50x_usb_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- at76c50x-usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
at76c50x-usb.c +2 -2
@@ -12,8 +12,8 @@ static char *hw_versions[] = { " 505AMX", }; -int -at76c50x_usb_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int at76c50x_usb_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {u8 version = (u8)(regs->version >>24 );u8 rev_id = (u8)(regs->version);
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 27/33 fix unused parameter warning in fec_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/fec.c:197:43: error: unused parameter 'info' [-Werror,-Wunused-parameter] int fec_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- fec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fec.c +2 -1
@@ -194,7 +194,8 @@ static void fec_dump_reg_v2(int reg, u32 val)#undef FIELD#undef REG -int fec_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int fec_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {const u32 *data = (u32 *)regs->data;int offset;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 28/33 fix unused parameter warning in amd8111e_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/amd8111e.c:155:48: error: unused parameter 'info' [-Werror,-Wunused-parameter] int amd8111e_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- amd8111e.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
amd8111e.c +2 -1
@@ -152,7 +152,8 @@ typedef enum {#define PHY_SPEED_100 0x3 -int amd8111e_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int amd8111e_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {u32 *reg_buff = (u32 *)regs->data;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 29/33 fix unused parameter warning in et131x_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/et131x.c:5:46: error: unused parameter 'info' [-Werror,-Wunused-parameter] int et131x_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- et131x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
et131x.c +2 -1
@@ -2,7 +2,8 @@#include <string.h> #include "internal.h" -int et131x_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int et131x_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {u8 version = (u8)(regs->version >>24 );u32 *reg = (u32 *)regs->data;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 30/33 fix unused parameter warning in ibm_emac_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/ibm_emac.c:317:48: error: unused parameter 'info' [-Werror,-Wunused-parameter] int ibm_emac_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- ibm_emac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
ibm_emac.c +2 -1
@@ -314,7 +314,8 @@ static void *print_tah_regs(void *buf)return p +1 ; } -int ibm_emac_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int ibm_emac_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {struct emac_ethtool_regs_hdr *hdr = (struct emac_ethtool_regs_hdr *)regs->data;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 31/33 fix unused parameter warning in ixgb_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/ixgb.c:42:40: error: unused parameter 'info' [-Werror,-Wunused-parameter] ixgb_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- ixgb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
ixgb.c +2 -2
@@ -38,8 +38,8 @@#define IXGB_RAH_ASEL_SRC 0x00010000#define IXGB_RAH_AV 0x80000000 -int -ixgb_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int ixgb_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {u32 *regs_buff = (u32 *)regs->data;u8 version = (u8)(regs->version >>24 );
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 32/33 fix unused parameter warning in fjes_dump_regs()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/fjes.c:5:44: error: unused parameter 'info' [-Werror,-Wunused-parameter] int fjes_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
--- fjes.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fjes.c +2 -1
@@ -2,7 +2,8 @@#include <stdio.h> #include "internal.h" -int fjes_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs) +int fjes_dump_regs(struct ethtool_drvinfo *info maybe_unused, +struct ethtool_regs *regs) {u32 *regs_buff = (u32 *)regs->data;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
PATCH 33/33 fix unused parameter warning in e1000_get_mac_type()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/e1000.c:258:38: error: unused parameter 'revision_id' [-Werror,-Wunused-parameter] e1000_get_mac_type(u16 device_id, u8 revision_id)
--- e1000.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
e1000.c +3 -4
@@ -254,8 +254,7 @@ enum e1000_mac_type { e1000_num_macs }; -static enum e1000_mac_type -e1000_get_mac_type (u16 device_id,u8 revision_id) +static enum e1000_mac_type e1000_get_mac_type (u16 device_id) {enum e1000_mac_type mac_type = e1000_undefined;
@@ -369,7 +368,7 @@ int e1000_dump_regs(struct ethtool_drvinfo *info maybe_unused, {u32 *regs_buff = (u32 *)regs->data;u16 hw_device_id = (u16 )regs->version; -u8 hw_revision_id = (u8)(regs->version >>16 ); +/* u8 hw_revision_id = (u8)(regs->version >> 16); */ u8 version = (u8)(regs->version >>24 );enum e1000_mac_type mac_type;u32 reg;
@@ -377,7 +376,7 @@ int e1000_dump_regs(struct ethtool_drvinfo *info maybe_unused,if (version !=1 )return -1 ; - mac_type =e1000_get_mac_type (hw_device_id, hw_revision_id); + mac_type =e1000_get_mac_type (hw_device_id);if (mac_type == e1000_undefined)return -1 ;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
Re: [PATCH 01/33] fix arithmetic on pointer to void is a GNU extension warning
In reply to Maciej ŻenczykowskiQuoted 29 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
This fixes:
external/ethtool/marvell.c:127:22: error: arithmetic on a pointer to void is a GNU extension [-Werror,-Wpointer-arith]dump_timer("LED", p + 0x20);(and remove some spare whitespace while we're at it)
Signed-off-by Maciej Żenczykowski <[email protected]>Change-Id Ia49b0baa9b8d00ccbe802780c226ca03ec9307f0--- marvell.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)marvell.c +0
-7@@ -118,13 +118,13 @@ static void dump_fifo(const char *name, const void *p)printf ("\n%s\n" , name);printf ("---------------\n" );printf ("End Address 0x%08X\n" , r[0 ]); -printf ("Write Pointer 0x%08X\n" , r[1 ]); -printf ("Read Pointer 0x%08X\n" , r[2 ]); -printf ("Packet Counter 0x%08X\n" , r[3 ]); -printf ("Level 0x%08X\n" , r[4 ]); -printf ("Control 0x%08X\n" , r[5 ]); -printf ("Control/Test 0x%08X\n" , r[6 ]); -dump_timer ("LED" , p +0x20 );
marvell.c static void dump_fifo(const char *name, const void *p) · line 130
Quoted 10 lines
marvell.c +7
-0+printf ("Write Pointer 0x%08X\n" , r[1 ]); +printf ("Read Pointer 0x%08X\n" , r[2 ]); +printf ("Packet Counter 0x%08X\n" , r[3 ]); +printf ("Level 0x%08X\n" , r[4 ]); +printf ("Control 0x%08X\n" , r[5 ]); +printf ("Control/Test 0x%08X\n" , r[6 ]); +dump_timer ("LED" , r +8 ); }static void dump_gmac_fifo (const char *name,const void *p)
Quoted 5 lines · Maciej Żenczykowski
You can merge them via:
git fetch https://github.com/zenczykowski/ethtool.git fix-warnings git mergeFETCH_HEADand I'll follow up this email with the full set.
Thanks -- queued for next release...
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.