Skip to content

Commit

Permalink
iwlegacy: convert hex_dump_to_buffer() to %*ph
Browse files Browse the repository at this point in the history
There is no need to use hex_dump_to_buffer() in the cases like this:

	hexdump_to_buffer(buf, len, 16, 1, outbuf, outlen, false);	/* len <= 16 */
	sprintf("%s\n", outbuf);

since it maybe easily converted to simple:

	sprintf("%*ph\n", len, buf);

Note: it seems in the case the output is groupped by 2 bytes and looks like a
typo. Thus, patch changes that to plain byte stream.

Signed-off-by: Andy Shevchenko <[email protected]>
Signed-off-by: Kalle Valo <[email protected]>
  • Loading branch information
andy-shev authored and Kalle Valo committed Jul 21, 2015
1 parent 5d6af28 commit 8358491
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion drivers/net/wireless/iwlegacy/3945-mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -3259,7 +3259,7 @@ il3945_show_measurement(struct device *d, struct device_attribute *attr,

while (size && PAGE_SIZE - len) {
hex_dump_to_buffer(data + ofs, size, 16, 1, buf + len,
PAGE_SIZE - len, 1);
PAGE_SIZE - len, true);
len = strlen(buf);
if (PAGE_SIZE - len)
buf[len++] = '\n';
Expand Down
8 changes: 2 additions & 6 deletions drivers/net/wireless/iwlegacy/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -515,12 +515,8 @@ il_dbgfs_nvm_read(struct file *file, char __user *user_buf, size_t count,
scnprintf(buf + pos, buf_size - pos, "EEPROM " "version: 0x%x\n",
eeprom_ver);
for (ofs = 0; ofs < eeprom_len; ofs += 16) {
pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x ", ofs);
hex_dump_to_buffer(ptr + ofs, 16, 16, 2, buf + pos,
buf_size - pos, 0);
pos += strlen(buf + pos);
if (buf_size - pos > 0)
buf[pos++] = '\n';
pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x %16ph\n",
ofs, ptr + ofs);
}

ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
Expand Down

0 comments on commit 8358491

Please sign in to comment.