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

Commit 3cd6e2f7 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Emmanuel Grumbach
Browse files

iwlwifi: 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 one 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 avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 1be5d8cc

drivers/net/wireless/iwlwifi/dvm/debugfs.c

+2 −6
Original line number Diff line number Diff line
@@ -310,12 +310,8 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file, 
	pos += scnprintf(buf + pos, buf_size - pos,

			 "NVM version: 0x%x\n", nvm_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);

drivers/net/wireless/iwlwifi/mvm/debugfs.c

+1 −6
Original line number Diff line number Diff line
@@ -1200,12 +1200,7 @@ static ssize_t iwl_dbgfs_d3_sram_read(struct file *file, char __user *user_buf, 
	if (ptr) {

		for (ofs = 0; ofs < len; ofs += 16) {

			pos += scnprintf(buf + pos, bufsz - pos,

					 "0x%.4x ", ofs);

			hex_dump_to_buffer(ptr + ofs, 16, 16, 1, buf + pos,

					   bufsz - pos, false);

			pos += strlen(buf + pos);

			if (bufsz - pos > 0)

				buf[pos++] = '\n';

					 "0x%.4x %16ph\n", ofs, ptr + ofs);

		}

	} else {

		pos += scnprintf(buf + pos, bufsz - pos,