Commit a202fbbf authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Torvalds

drivers/net/wireless/ath/wil6210: use seq_hex_dump() to dump buffers

Instead of custom approach let's use recently introduced seq_hex_dump()
helper.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Joe Perches <joe@perches.com>
Cc: Tadeusz Struk <tadeusz.struk@intel.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6fc37c49
...@@ -156,6 +156,12 @@ static const struct file_operations fops_vring = { ...@@ -156,6 +156,12 @@ static const struct file_operations fops_vring = {
.llseek = seq_lseek, .llseek = seq_lseek,
}; };
static void wil_seq_hexdump(struct seq_file *s, void *p, int len,
const char *prefix)
{
seq_hex_dump(s, prefix, DUMP_PREFIX_NONE, 16, 1, p, len, false);
}
static void wil_print_ring(struct seq_file *s, const char *prefix, static void wil_print_ring(struct seq_file *s, const char *prefix,
void __iomem *off) void __iomem *off)
{ {
...@@ -212,8 +218,6 @@ static void wil_print_ring(struct seq_file *s, const char *prefix, ...@@ -212,8 +218,6 @@ static void wil_print_ring(struct seq_file *s, const char *prefix,
le16_to_cpu(hdr.seq), len, le16_to_cpu(hdr.seq), len,
le16_to_cpu(hdr.type), hdr.flags); le16_to_cpu(hdr.type), hdr.flags);
if (len <= MAX_MBOXITEM_SIZE) { if (len <= MAX_MBOXITEM_SIZE) {
int n = 0;
char printbuf[16 * 3 + 2];
unsigned char databuf[MAX_MBOXITEM_SIZE]; unsigned char databuf[MAX_MBOXITEM_SIZE];
void __iomem *src = wmi_buffer(wil, d.addr) + void __iomem *src = wmi_buffer(wil, d.addr) +
sizeof(struct wil6210_mbox_hdr); sizeof(struct wil6210_mbox_hdr);
...@@ -223,16 +227,7 @@ static void wil_print_ring(struct seq_file *s, const char *prefix, ...@@ -223,16 +227,7 @@ static void wil_print_ring(struct seq_file *s, const char *prefix,
* reading header * reading header
*/ */
wil_memcpy_fromio_32(databuf, src, len); wil_memcpy_fromio_32(databuf, src, len);
while (n < len) { wil_seq_hexdump(s, databuf, len, " : ");
int l = min(len - n, 16);
hex_dump_to_buffer(databuf + n, l,
16, 1, printbuf,
sizeof(printbuf),
false);
seq_printf(s, " : %s\n", printbuf);
n += l;
}
} }
} else { } else {
seq_puts(s, "\n"); seq_puts(s, "\n");
...@@ -867,22 +862,6 @@ static const struct file_operations fops_wmi = { ...@@ -867,22 +862,6 @@ static const struct file_operations fops_wmi = {
.open = simple_open, .open = simple_open,
}; };
static void wil_seq_hexdump(struct seq_file *s, void *p, int len,
const char *prefix)
{
char printbuf[16 * 3 + 2];
int i = 0;
while (i < len) {
int l = min(len - i, 16);
hex_dump_to_buffer(p + i, l, 16, 1, printbuf,
sizeof(printbuf), false);
seq_printf(s, "%s%s\n", prefix, printbuf);
i += l;
}
}
static void wil_seq_print_skb(struct seq_file *s, struct sk_buff *skb) static void wil_seq_print_skb(struct seq_file *s, struct sk_buff *skb)
{ {
int i = 0; int i = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment