Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8358491d authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Kalle Valo
Browse files

iwlegacy: convert hex_dump_to_buffer() to %*ph 



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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 5d6af28a

drivers/net/wireless/iwlegacy/3945-mac.c

+1 −1
Original line number Diff line number Diff line
@@ -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';

drivers/net/wireless/iwlegacy/debug.c

+2 −6
Original line number Diff line number Diff line
@@ -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);