Bunch of compiler warning fixes for ethtool.

Bunch of compiler warning fixes for ethtool.

[Maciej Żenczykowski]

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 01/33] fix arithmetic on pointer to void is a GNU extension warning

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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 <maze@google.com>
Change-Id: Ia49b0baa9b8d00ccbe802780c226ca03ec9307f0
---
 marvell.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/marvell.c b/marvell.c
index af21188..27785be 100644
--- a/marvell.c
+++ b/marvell.c
@@ -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)
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 02/33] fix unused parameter warnings in do_version() and show_usage()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0cc52f33bb0e8d7627f5e84bb4e3dfa821d17cc8
---
 ethtool.c  | 4 ++--
 internal.h | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ethtool.c b/ethtool.c
index 082e37f..5e0deda 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -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;
 
diff --git a/internal.h b/internal.h
index aecf1ce..ff52c6e 100644
--- a/internal.h
+++ b/internal.h
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 03/33] fix unused parameter warning in find_option()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

This fixes:
  external/ethtool/ethtool.c:5417:28: error: unused parameter 'argc' [-Werror,-Wunused-parameter]
  static int find_option(int argc, char **argp)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I7782cac5f58e217fc6032037a2f248b03573b9d4
---
 ethtool.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ethtool.c b/ethtool.c
index 5e0deda..0f3fe7f 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -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--;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 04/33] fix unused parameter warning in dump_eeprom()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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,

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I57c65a8d21c6864d4c09f37bb3d408348ea03c4f
---
 ethtool.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ethtool.c b/ethtool.c
index 0f3fe7f..acf183d 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -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) {
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 05/33] fix unused parameter warning in altera_tse_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

This fixes:
  external/ethtool/tse.c:28:50: error: unused parameter 'info' [-Werror,-Wunused-parameter]
  int altera_tse_dump_regs(struct ethtool_drvinfo *info,

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I555f0e3c55bba999aeb64f1e1435744590ea389d
---
 tse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tse.c b/tse.c
index f554dfe..e5241ee 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,
+int altera_tse_dump_regs(struct ethtool_drvinfo *info maybe_unused,
 			 struct ethtool_regs *regs)
 {
 	int i;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 06/33] fix unused parameter warning in sfc_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia255a280742332c44b66bf8f5bb678abc7e3467b
---
 sfc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sfc.c b/sfc.c
index b4c590f..69c61e2 100644
--- a/sfc.c
+++ b/sfc.c
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 07/33] fix unused parameter warning in print_simple_table()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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,

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I253158a534c295b13e13dd02461952927cf8814c
---
 sfc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sfc.c b/sfc.c
index 69c61e2..f56243d 100644
--- a/sfc.c
+++ b/sfc.c
@@ -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);
 		}
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 08/33] fix unused parameter warning in natsemi_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib45adc15c39be9886fdc77ee488aba6b67726096
---
 natsemi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/natsemi.c b/natsemi.c
index ac29be5..e6e94b0 100644
--- a/natsemi.c
+++ b/natsemi.c
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 09/33] fix unused parameter warning in netsemi_dump_eeprom()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I40d66f887d18ac6e69e1f365767a19f580a44f69
---
 natsemi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/natsemi.c b/natsemi.c
index e6e94b0..ce82c42 100644
--- a/natsemi.c
+++ b/natsemi.c
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 10/33] fix unused parameter warning in ixgbe_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I745f6b9582bc176eafdce9e292a4bf2a951c0c69
---
 ixgbe.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ixgbe.c b/ixgbe.c
index 6779402..9754b2a 100644
--- a/ixgbe.c
+++ b/ixgbe.c
@@ -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);
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 11/33] fix unused parameter warning in realtek_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I62fa7dbb66d5ae545272b41538198787dbbfbe25
---
 realtek.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/realtek.c b/realtek.c
index e437466..d10cfd4 100644
--- a/realtek.c
+++ b/realtek.c
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 12/33] fix unused parameter warning in lan78xx_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibc67c27248ca623e9ca8534d43c888af3cf9997b
---
 lan78xx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lan78xx.c b/lan78xx.c
index bb64e80..46ade1c 100644
--- a/lan78xx.c
+++ b/lan78xx.c
@@ -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;
 
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 13/33] fix unused parameter warning in {skge,sky2}_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ic60f9596ac59f15d44ebb80f9438c4978f13b48c
---
 marvell.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/marvell.c b/marvell.c
index 27785be..9e5440d 100644
--- a/marvell.c
+++ b/marvell.c
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 14/33] fix unused parameter warning in dsa_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I7da1206aab480823b6aee2aa013db3e2912c8294
---
 dsa.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dsa.c b/dsa.c
index 02a10dd..50a171b 100644
--- a/dsa.c
+++ b/dsa.c
@@ -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))
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 15/33] fix unused parameter warning in vmxnet3_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I5494339c8d17e72424651e7056605cd61aa6d4b8
---
 vmxnet3.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vmxnet3.c b/vmxnet3.c
index 621d02f..c972145 100644
--- a/vmxnet3.c
+++ b/vmxnet3.c
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 16/33] fix unused parameter warning in st_{mac100,gmac}_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie72738aea1d903df4aec417cbead9e6109ee108f
---
 stmmac.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/stmmac.c b/stmmac.c
index 79ef151..98d9058 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,
+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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 17/33] fix unused parameter warning in ixgbevf_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I6f3233ceb46bc6b96eca673578fa2a6281ea8ad7
---
 ixgbevf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ixgbevf.c b/ixgbevf.c
index 2a3aa6f..265e0bf 100644
--- a/ixgbevf.c
+++ b/ixgbevf.c
@@ -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);
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 18/33] fix unused parameter warning in fec_8xx_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Iefd61cf2b89804fab8ca6c845196706684ddd45e
---
 fec_8xx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fec_8xx.c b/fec_8xx.c
index 69db8c8..02ecaef 100644
--- a/fec_8xx.c
+++ b/fec_8xx.c
@@ -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;
 
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 19/33] fix unused parameter warning in tg3_dump_{eeprom,regs}()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I9b357d371095df4b24f2c6ec32fa3d0c99731805
---
 tg3.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tg3.c b/tg3.c
index 3232339..8698391 100644
--- a/tg3.c
+++ b/tg3.c
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 20/33] fix unused parameter warning in vioc_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2b25a5c4d23af281616847ceb75ca8c70dfb44d0
---
 vioc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vioc.c b/vioc.c
index eff533d..ef163ab 100644
--- a/vioc.c
+++ b/vioc.c
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 21/33] fix unused parameter warning in e100_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Idc6e3bb3fb837555425ddd6cc903e8763a4c71e1
---
 e100.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/e100.c b/e100.c
index b982e79..540ae35 100644
--- a/e100.c
+++ b/e100.c
@@ -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);
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 22/33] fix unused parameter warning in de2104[01]_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I154a2a283f83e22180217b9aeec46bd8290a2200
---
 de2104x.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/de2104x.c b/de2104x.c
index 856e0c0..cc03533 100644
--- a/de2104x.c
+++ b/de2104x.c
@@ -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;
 
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 23/33] fix unused parameter warning in igb_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If2e175d1b1bd3976d760dc359b52c304e8334f92
---
 igb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/igb.c b/igb.c
index cb24877..89b5cdb 100644
--- a/igb.c
+++ b/igb.c
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 24/33] fix unused parameter warning in e1000_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib0bf9e87137f256adf6e93f90d7f9426ab376a52
---
 e1000.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/e1000.c b/e1000.c
index afeb7f8..da057b7 100644
--- a/e1000.c
+++ b/e1000.c
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 25/33] fix unused parameter warning in smsc911x_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I419e8e365481020241303033fcdfaf31aaf4e178
---
 smsc911x.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/smsc911x.c b/smsc911x.c
index c55b97b..bafee21 100644
--- a/smsc911x.c
+++ b/smsc911x.c
@@ -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;
 
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 26/33] fix unused parameter warning in at76c50x_usb_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I4ca9edb1b155c63f14268aebf7bdc81bce53b85d
---
 at76c50x-usb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/at76c50x-usb.c b/at76c50x-usb.c
index 39e24a4..0121e98 100644
--- a/at76c50x-usb.c
+++ b/at76c50x-usb.c
@@ -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);
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 27/33] fix unused parameter warning in fec_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I5d53deb593d72dcfde95b62f1651dd8f5d6aa3ba
---
 fec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fec.c b/fec.c
index 01b1d34..22bc09f 100644
--- a/fec.c
+++ b/fec.c
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 28/33] fix unused parameter warning in amd8111e_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I885d775f4b56f75b8f5bfa2abefb00af5abd9f95
---
 amd8111e.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/amd8111e.c b/amd8111e.c
index 23478f0..5a056b3 100644
--- a/amd8111e.c
+++ b/amd8111e.c
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 29/33] fix unused parameter warning in et131x_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I4e90a489bdd3a0a04817149b1b6a86e7ef9f106d
---
 et131x.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/et131x.c b/et131x.c
index 36abaa2..1b06071 100644
--- a/et131x.c
+++ b/et131x.c
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 30/33] fix unused parameter warning in ibm_emac_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I18f305612e48ae76031ae327acf134d1623a8a3d
---
 ibm_emac.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ibm_emac.c b/ibm_emac.c
index 75cb560..3259c17 100644
--- a/ibm_emac.c
+++ b/ibm_emac.c
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 31/33] fix unused parameter warning in ixgb_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I674e03805dc9a4633d0299d9f4e88bd4ddb61359
---
 ixgb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ixgb.c b/ixgb.c
index 8687c21..7c16c6e 100644
--- a/ixgb.c
+++ b/ixgb.c
@@ -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);
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 32/33] fix unused parameter warning in fjes_dump_regs()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Id5409c70e26f4e131a8557a9c8f0a0c921dfefde
---
 fjes.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fjes.c b/fjes.c
index 52f7c28..4c5f6bc 100644
--- a/fjes.c
+++ b/fjes.c
@@ -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;
 
-- 
2.23.0.866.gb869b98d4c-goog

[PATCH 33/33] fix unused parameter warning in e1000_get_mac_type()

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

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)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2469ef61996fd273cc3a2a6a7af0ae889c81b02b
---
 e1000.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/e1000.c b/e1000.c
index da057b7..91e5bc1 100644
--- a/e1000.c
+++ b/e1000.c
@@ -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;
-- 
2.23.0.866.gb869b98d4c-goog

Re: [PATCH 01/33] fix arithmetic on pointer to void is a GNU extension warning

[Michal Kubecek]

On Thu, Oct 17, 2019 at 11:20:49AM -0700, Maciej Żenczykowski wrote:
> From: Maciej Żenczykowski <maze@google.com>
> 
> 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 <maze@google.com>
> Change-Id: Ia49b0baa9b8d00ccbe802780c226ca03ec9307f0
> ---
>  marvell.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/marvell.c b/marvell.c
> index af21188..27785be 100644
> --- a/marvell.c
> +++ b/marvell.c
> @@ -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)

Reviewed-by: Michal Kubecek <mkubecek@suse.cz>

Re: [PATCH 02/33] fix unused parameter warnings in do_version() and show_usage()

[Michal Kubecek]

On Thu, Oct 17, 2019 at 11:20:50AM -0700, Maciej Żenczykowski wrote:
> From: Maciej Żenczykowski <maze@google.com>
> 
> 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)
> 
> Signed-off-by: Maciej Żenczykowski <maze@google.com>
> Change-Id: I0cc52f33bb0e8d7627f5e84bb4e3dfa821d17cc8
> ---
>  ethtool.c  | 4 ++--
>  internal.h | 2 ++
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/ethtool.c b/ethtool.c
> index 082e37f..5e0deda 100644
> --- a/ethtool.c
> +++ b/ethtool.c
> @@ -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

>  	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;
>  
> diff --git a/internal.h b/internal.h
> index aecf1ce..ff52c6e 100644
> --- a/internal.h
> +++ b/internal.h
> @@ -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;
> -- 
> 2.23.0.866.gb869b98d4c-goog
> 

Re: [PATCH 02/33] fix unused parameter warnings in do_version() and show_usage()

[Maciej Żenczykowski]

> 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.

Re: Bunch of compiler warning fixes for ethtool.

[John W. Linville]

On Wed, Oct 16, 2019 at 09:35:02PM -0700, Maciej Żenczykowski wrote:
> 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.

Thanks -- queued for next release...

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.