Commit a20fd0a783551831bb6b9b69710e5bbb93dc2730
Committed by
David S. Miller
1 parent
8c165a8383
Exists in
master
and in
20 other branches
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>
Showing 1 changed file with 9 additions and 29 deletions Side-by-side Diff
drivers/uwb/wlp/eda.c
... | ... | @@ -313,12 +313,9 @@ |
313 | 313 | list_for_each_entry(itr, &eda->cache, list_node) { |
314 | 314 | if (!memcmp(itr->virt_addr, virt_addr, |
315 | 315 | sizeof(itr->virt_addr))) { |
316 | - d_printf(6, dev, "EDA: looking for " | |
317 | - "%02x:%02x:%02x:%02x:%02x:%02x hit %02x:%02x " | |
316 | + d_printf(6, dev, "EDA: looking for %pM hit %02x:%02x " | |
318 | 317 | "wss %p tag 0x%02x state %u\n", |
319 | - virt_addr[0], virt_addr[1], | |
320 | - virt_addr[2], virt_addr[3], | |
321 | - virt_addr[4], virt_addr[5], | |
318 | + virt_addr, | |
322 | 319 | itr->dev_addr.data[1], |
323 | 320 | itr->dev_addr.data[0], itr->wss, |
324 | 321 | itr->tag, itr->state); |
325 | 322 | |
... | ... | @@ -327,24 +324,13 @@ |
327 | 324 | found = 1; |
328 | 325 | break; |
329 | 326 | } else |
330 | - d_printf(6, dev, "EDA: looking for " | |
331 | - "%02x:%02x:%02x:%02x:%02x:%02x " | |
332 | - "against " | |
333 | - "%02x:%02x:%02x:%02x:%02x:%02x miss\n", | |
334 | - virt_addr[0], virt_addr[1], | |
335 | - virt_addr[2], virt_addr[3], | |
336 | - virt_addr[4], virt_addr[5], | |
337 | - itr->virt_addr[0], itr->virt_addr[1], | |
338 | - itr->virt_addr[2], itr->virt_addr[3], | |
339 | - itr->virt_addr[4], itr->virt_addr[5]); | |
327 | + d_printf(6, dev, "EDA: looking for %pM against %pM miss\n", | |
328 | + virt_addr, itr->virt_addr); | |
340 | 329 | } |
341 | 330 | if (!found) { |
342 | 331 | if (printk_ratelimit()) |
343 | - dev_err(dev, "EDA: Eth addr %02x:%02x:%02x" | |
344 | - ":%02x:%02x:%02x not found.\n", | |
345 | - virt_addr[0], virt_addr[1], | |
346 | - virt_addr[2], virt_addr[3], | |
347 | - virt_addr[4], virt_addr[5]); | |
332 | + dev_err(dev, "EDA: Eth addr %pM not found.\n", | |
333 | + virt_addr); | |
348 | 334 | result = -ENODEV; |
349 | 335 | } |
350 | 336 | spin_unlock_irqrestore(&eda->lock, flags); |
351 | 337 | |
... | ... | @@ -380,19 +366,13 @@ |
380 | 366 | "tag state virt_addr\n"); |
381 | 367 | list_for_each_entry(entry, &eda->cache, list_node) { |
382 | 368 | result += scnprintf(buf + result, PAGE_SIZE - result, |
383 | - "%02x:%02x:%02x:%02x:%02x:%02x %02x:%02x " | |
384 | - "%p 0x%02x %s " | |
385 | - "%02x:%02x:%02x:%02x:%02x:%02x\n", | |
386 | - entry->eth_addr[0], entry->eth_addr[1], | |
387 | - entry->eth_addr[2], entry->eth_addr[3], | |
388 | - entry->eth_addr[4], entry->eth_addr[5], | |
369 | + "%pM %02x:%02x %p 0x%02x %s %pM\n", | |
370 | + entry->eth_addr, | |
389 | 371 | entry->dev_addr.data[1], |
390 | 372 | entry->dev_addr.data[0], entry->wss, |
391 | 373 | entry->tag, |
392 | 374 | wlp_wss_connect_state_str(entry->state), |
393 | - entry->virt_addr[0], entry->virt_addr[1], | |
394 | - entry->virt_addr[2], entry->virt_addr[3], | |
395 | - entry->virt_addr[4], entry->virt_addr[5]); | |
375 | + entry->virt_addr); | |
396 | 376 | if (result >= PAGE_SIZE) |
397 | 377 | break; |
398 | 378 | } |