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

Commit a20fd0a7 authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

uwb: use the %pM formatting specifier in eda.c 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8c165a83

drivers/uwb/wlp/eda.c

+9 −29
Original line number Diff line number Diff line
@@ -313,12 +313,9 @@ int wlp_eda_for_virtual(struct wlp_eda *eda, 
	list_for_each_entry(itr, &eda->cache, list_node) {

		if (!memcmp(itr->virt_addr, virt_addr,

			   sizeof(itr->virt_addr))) {

			d_printf(6, dev, "EDA: looking for "

			       "%02x:%02x:%02x:%02x:%02x:%02x hit %02x:%02x "

			d_printf(6, dev, "EDA: looking for %pM hit %02x:%02x "

			       "wss %p tag 0x%02x state %u\n",

			       virt_addr[0], virt_addr[1],

			       virt_addr[2], virt_addr[3],

			       virt_addr[4], virt_addr[5],

			       virt_addr,

			       itr->dev_addr.data[1],

			       itr->dev_addr.data[0], itr->wss,

			       itr->tag, itr->state);
@@ -327,24 +324,13 @@ int wlp_eda_for_virtual(struct wlp_eda *eda, 
			found = 1;

			break;

		} else

			d_printf(6, dev, "EDA: looking for "

			       "%02x:%02x:%02x:%02x:%02x:%02x "

			       "against "

			       "%02x:%02x:%02x:%02x:%02x:%02x miss\n",

			       virt_addr[0], virt_addr[1],

			       virt_addr[2], virt_addr[3],

			       virt_addr[4], virt_addr[5],

			       itr->virt_addr[0], itr->virt_addr[1],

			       itr->virt_addr[2], itr->virt_addr[3],

			       itr->virt_addr[4], itr->virt_addr[5]);

			d_printf(6, dev, "EDA: looking for %pM against %pM miss\n",

			         virt_addr, itr->virt_addr);

	}

	if (!found) {

		if (printk_ratelimit())

			dev_err(dev, "EDA: Eth addr %02x:%02x:%02x"

				":%02x:%02x:%02x not found.\n",

				virt_addr[0], virt_addr[1],

				virt_addr[2], virt_addr[3],

				virt_addr[4], virt_addr[5]);

			dev_err(dev, "EDA: Eth addr %pM not found.\n",

				virt_addr);

		result = -ENODEV;

	}

	spin_unlock_irqrestore(&eda->lock, flags);
@@ -380,19 +366,13 @@ ssize_t wlp_eda_show(struct wlp *wlp, char *buf) 
			   "tag state virt_addr\n");

	list_for_each_entry(entry, &eda->cache, list_node) {

		result += scnprintf(buf + result, PAGE_SIZE - result,

				    "%02x:%02x:%02x:%02x:%02x:%02x %02x:%02x "

				    "%p 0x%02x %s "

				    "%02x:%02x:%02x:%02x:%02x:%02x\n",

				    entry->eth_addr[0], entry->eth_addr[1],

				    entry->eth_addr[2], entry->eth_addr[3],

				    entry->eth_addr[4], entry->eth_addr[5],

				    "%pM %02x:%02x %p 0x%02x %s %pM\n",

				    entry->eth_addr,

				    entry->dev_addr.data[1],

				    entry->dev_addr.data[0], entry->wss,

				    entry->tag,

				    wlp_wss_connect_state_str(entry->state),

				    entry->virt_addr[0], entry->virt_addr[1],

				    entry->virt_addr[2], entry->virt_addr[3],

				    entry->virt_addr[4], entry->virt_addr[5]);

				    entry->virt_addr);

		if (result >= PAGE_SIZE)

			break;

	}