Skip to contentSkip to conversation

i40e: re-use %*ph specifier to hexdump a data

PATCH In review Andy Shevchenko 3 participants 3 messages Oct 2, 2015 – Oct 9, 2015

Subsystems (3)
Networking Network drivers Intel Ethernet
lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 1/1 i40e: re-use %*ph specifier to hexdump a data

Instead of using a custom approach change the code to use %*ph format specifier.

Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/net/ethernet/intel/i40e/i40e_common.c   | 22 ++++------------------
 drivers/net/ethernet/intel/i40evf/i40e_common.c | 22 ++++------------------
 2 files changed, 8 insertions(+), 36 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +4 -18
index 114dc64..3bc772c 100644
@@ -329,25 +329,11 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc,
 			len = buf_len;
 		/* write the full 16-byte chunks */
 		for (i = 0; i < (len - 16); i += 16)
-			i40e_debug(hw, mask,
-				   "\t0x%04X  %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n",
-				   i, buf[i], buf[i + 1], buf[i + 2],
-				   buf[i + 3], buf[i + 4], buf[i + 5],
-				   buf[i + 6], buf[i + 7], buf[i + 8],
-				   buf[i + 9], buf[i + 10], buf[i + 11],
-				   buf[i + 12], buf[i + 13], buf[i + 14],
-				   buf[i + 15]);
+			i40e_debug(hw, mask, "\t0x%04X  %16ph\n", i, buf + i);
 		/* write whatever's left over without overrunning the buffer */
-		if (i < len) {
-			char d_buf[80];
-			int j = 0;
-
-			memset(d_buf, 0, sizeof(d_buf));
-			j += sprintf(d_buf, "\t0x%04X ", i);
-			while (i < len)
-				j += sprintf(&d_buf[j], " %02X", buf[i++]);
-			i40e_debug(hw, mask, "%s\n", d_buf);
-		}
+		if (i < len)
+			i40e_debug(hw, mask, "\t0x%04X  %*ph\n",
+					     i, len - i, buf + i);
 	}
 }
drivers/net/ethernet/intel/i40evf/i40e_common.c +4 -18
index d45d0ae..200bbcb 100644
@@ -329,25 +329,11 @@ void i40evf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc,
 			len = buf_len;
 		/* write the full 16-byte chunks */
 		for (i = 0; i < (len - 16); i += 16)
-			i40e_debug(hw, mask,
-				   "\t0x%04X  %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n",
-				   i, buf[i], buf[i + 1], buf[i + 2],
-				   buf[i + 3], buf[i + 4], buf[i + 5],
-				   buf[i + 6], buf[i + 7], buf[i + 8],
-				   buf[i + 9], buf[i + 10], buf[i + 11],
-				   buf[i + 12], buf[i + 13], buf[i + 14],
-				   buf[i + 15]);
+			i40e_debug(hw, mask, "\t0x%04X  %16ph\n", i, buf + i);
 		/* write whatever's left over without overrunning the buffer */
-		if (i < len) {
-			char d_buf[80];
-			int j = 0;
-
-			memset(d_buf, 0, sizeof(d_buf));
-			j += sprintf(d_buf, "\t0x%04X ", i);
-			while (i < len)
-				j += sprintf(&d_buf[j], " %02X", buf[i++]);
-			i40e_debug(hw, mask, "%s\n", d_buf);
-		}
+		if (i < len)
+			i40e_debug(hw, mask, "\t0x%04X  %*ph\n",
+					     i, len - i, buf + i);
 	}
 }
Signature · 1 line
2.5.1
#1 lore raw

PATCH 1/1 i40e: re-use %*ph specifier to hexdump a data

Quoted 10 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Andy Shevchenko
Sent: Friday, October 02, 2015 2:18 AM
To: Kirsher, Jeffrey T; intel-wired-lan at lists.osuosl.org; netdev at vger.kernel.org
Cc: Andy Shevchenko
Subject: [Intel-wired-lan] [PATCH 1/1] i40e: re-use %*ph specifier to hexdump a data

Quoted 8 lines

Instead of using a custom approach change the code to use %*ph format specifier.

Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/net/ethernet/intel/i40e/i40e_common.c   | 22 ++++------------------
 drivers/net/ethernet/intel/i40evf/i40e_common.c | 22 ++++------------------
 2 files changed, 8 insertions(+), 36 deletions(-)
Tested-by Andrew Bowers <[email protected]>

Patch code changes correctly applied