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

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Harvey Harrison 2008-10-28 22:38:06 -07:00 committed by David S. Miller
parent 8c165a8383
commit a20fd0a783

View file

@ -313,12 +313,9 @@ int wlp_eda_for_virtual(struct wlp_eda *eda,
list_for_each_entry(itr, &eda->cache, list_node) { list_for_each_entry(itr, &eda->cache, list_node) {
if (!memcmp(itr->virt_addr, virt_addr, if (!memcmp(itr->virt_addr, virt_addr,
sizeof(itr->virt_addr))) { sizeof(itr->virt_addr))) {
d_printf(6, dev, "EDA: looking for " d_printf(6, dev, "EDA: looking for %pM hit %02x:%02x "
"%02x:%02x:%02x:%02x:%02x:%02x hit %02x:%02x "
"wss %p tag 0x%02x state %u\n", "wss %p tag 0x%02x state %u\n",
virt_addr[0], virt_addr[1], virt_addr,
virt_addr[2], virt_addr[3],
virt_addr[4], virt_addr[5],
itr->dev_addr.data[1], itr->dev_addr.data[1],
itr->dev_addr.data[0], itr->wss, itr->dev_addr.data[0], itr->wss,
itr->tag, itr->state); itr->tag, itr->state);
@ -327,24 +324,13 @@ int wlp_eda_for_virtual(struct wlp_eda *eda,
found = 1; found = 1;
break; break;
} else } else
d_printf(6, dev, "EDA: looking for " d_printf(6, dev, "EDA: looking for %pM against %pM miss\n",
"%02x:%02x:%02x:%02x:%02x:%02x " virt_addr, itr->virt_addr);
"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]);
} }
if (!found) { if (!found) {
if (printk_ratelimit()) if (printk_ratelimit())
dev_err(dev, "EDA: Eth addr %02x:%02x:%02x" dev_err(dev, "EDA: Eth addr %pM not found.\n",
":%02x:%02x:%02x not found.\n", virt_addr);
virt_addr[0], virt_addr[1],
virt_addr[2], virt_addr[3],
virt_addr[4], virt_addr[5]);
result = -ENODEV; result = -ENODEV;
} }
spin_unlock_irqrestore(&eda->lock, flags); 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"); "tag state virt_addr\n");
list_for_each_entry(entry, &eda->cache, list_node) { list_for_each_entry(entry, &eda->cache, list_node) {
result += scnprintf(buf + result, PAGE_SIZE - result, result += scnprintf(buf + result, PAGE_SIZE - result,
"%02x:%02x:%02x:%02x:%02x:%02x %02x:%02x " "%pM %02x:%02x %p 0x%02x %s %pM\n",
"%p 0x%02x %s " entry->eth_addr,
"%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],
entry->dev_addr.data[1], entry->dev_addr.data[1],
entry->dev_addr.data[0], entry->wss, entry->dev_addr.data[0], entry->wss,
entry->tag, entry->tag,
wlp_wss_connect_state_str(entry->state), wlp_wss_connect_state_str(entry->state),
entry->virt_addr[0], entry->virt_addr[1], entry->virt_addr);
entry->virt_addr[2], entry->virt_addr[3],
entry->virt_addr[4], entry->virt_addr[5]);
if (result >= PAGE_SIZE) if (result >= PAGE_SIZE)
break; break;
} }