1f2507
From 3960c91ade7b1ca9979eec5200a90dc11f339cfd Mon Sep 17 00:00:00 2001
1f2507
From: Ido Schimmel <idosch@nvidia.com>
1f2507
Date: Tue, 14 Sep 2021 14:27:37 +0300
1f2507
Subject: [PATCH 04/35] ethtool: Fix compilation warning when pretty dump is
1f2507
 disabled
1f2507
MIME-Version: 1.0
1f2507
Content-Type: text/plain; charset=UTF-8
1f2507
Content-Transfer-Encoding: 8bit
1f2507
1f2507
When pretty dump is disabled (i.e., configure --disable-pretty-dump),
1f2507
gcc 11.2.1 emits the following warning:
1f2507
1f2507
ethtool.c: In function ‘dump_regs’:
1f2507
ethtool.c:1160:31: warning: comparison is always false due to limited range of data type [-Wtype-limits]
1f2507
 1160 |                 for (i = 0; i < ARRAY_SIZE(driver_list); i++)
1f2507
      |                               ^
1f2507
1f2507
Fix it by avoiding iterating over 'driver_list' when pretty dump is
1f2507
disabled.
1f2507
1f2507
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
1f2507
---
1f2507
 ethtool.c | 13 ++++++++-----
1f2507
 1 file changed, 8 insertions(+), 5 deletions(-)
1f2507
1f2507
diff --git a/ethtool.c b/ethtool.c
1f2507
index 33a0a492cb15..1b79e9f8d958 100644
1f2507
--- a/ethtool.c
1f2507
+++ b/ethtool.c
1f2507
@@ -1089,12 +1089,12 @@ static int parse_hkey(char **rss_hkey, u32 key_size,
1f2507
 	return 0;
1f2507
 }
1f2507
 
1f2507
+#ifdef ETHTOOL_ENABLE_PRETTY_DUMP
1f2507
 static const struct {
1f2507
 	const char *name;
1f2507
 	int (*func)(struct ethtool_drvinfo *info, struct ethtool_regs *regs);
1f2507
 
1f2507
 } driver_list[] = {
1f2507
-#ifdef ETHTOOL_ENABLE_PRETTY_DUMP
1f2507
 	{ "8139cp", realtek_dump_regs },
1f2507
 	{ "8139too", realtek_dump_regs },
1f2507
 	{ "r8169", realtek_dump_regs },
1f2507
@@ -1129,8 +1129,8 @@ static const struct {
1f2507
 	{ "fec", fec_dump_regs },
1f2507
 	{ "igc", igc_dump_regs },
1f2507
 	{ "bnxt_en", bnxt_dump_regs },
1f2507
-#endif
1f2507
 };
1f2507
+#endif
1f2507
 
1f2507
 void dump_hex(FILE *file, const u8 *data, int len, int offset)
1f2507
 {
1f2507
@@ -1149,14 +1149,15 @@ void dump_hex(FILE *file, const u8 *data, int len, int offset)
1f2507
 static int dump_regs(int gregs_dump_raw, int gregs_dump_hex,
1f2507
 		     struct ethtool_drvinfo *info, struct ethtool_regs *regs)
1f2507
 {
1f2507
-	unsigned int i;
1f2507
-
1f2507
 	if (gregs_dump_raw) {
1f2507
 		fwrite(regs->data, regs->len, 1, stdout);
1f2507
 		goto nested;
1f2507
 	}
1f2507
 
1f2507
-	if (!gregs_dump_hex)
1f2507
+#ifdef ETHTOOL_ENABLE_PRETTY_DUMP
1f2507
+	if (!gregs_dump_hex) {
1f2507
+		unsigned int i;
1f2507
+
1f2507
 		for (i = 0; i < ARRAY_SIZE(driver_list); i++)
1f2507
 			if (!strncmp(driver_list[i].name, info->driver,
1f2507
 				     ETHTOOL_BUSINFO_LEN)) {
1f2507
@@ -1168,6 +1169,8 @@ static int dump_regs(int gregs_dump_raw, int gregs_dump_hex,
1f2507
 				 */
1f2507
 				break;
1f2507
 			}
1f2507
+	}
1f2507
+#endif
1f2507
 
1f2507
 	dump_hex(stdout, regs->data, regs->len, 0);
1f2507
 
1f2507
-- 
1f2507
2.35.1
1f2507