diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/uwb/wlp/eda.c | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/drivers/uwb/wlp/eda.c b/drivers/uwb/wlp/eda.c index cdfe8dfc4340..10985fa233cc 100644 --- a/drivers/uwb/wlp/eda.c +++ b/drivers/uwb/wlp/eda.c | |||
| @@ -313,12 +313,9 @@ int wlp_eda_for_virtual(struct wlp_eda *eda, | |||
| 313 | list_for_each_entry(itr, &eda->cache, list_node) { | 313 | list_for_each_entry(itr, &eda->cache, list_node) { |
| 314 | if (!memcmp(itr->virt_addr, virt_addr, | 314 | if (!memcmp(itr->virt_addr, virt_addr, |
| 315 | sizeof(itr->virt_addr))) { | 315 | sizeof(itr->virt_addr))) { |
| 316 | d_printf(6, dev, "EDA: looking for " | 316 | d_printf(6, dev, "EDA: looking for %pM hit %02x:%02x " |
| 317 | "%02x:%02x:%02x:%02x:%02x:%02x hit %02x:%02x " | ||
| 318 | "wss %p tag 0x%02x state %u\n", | 317 | "wss %p tag 0x%02x state %u\n", |
| 319 | virt_addr[0], virt_addr[1], | 318 | virt_addr, |
| 320 | virt_addr[2], virt_addr[3], | ||
| 321 | virt_addr[4], virt_addr[5], | ||
| 322 | itr->dev_addr.data[1], | 319 | itr->dev_addr.data[1], |
| 323 | itr->dev_addr.data[0], itr->wss, | 320 | itr->dev_addr.data[0], itr->wss, |
| 324 | itr->tag, itr->state); | 321 | itr->tag, itr->state); |
| @@ -327,24 +324,13 @@ int wlp_eda_for_virtual(struct wlp_eda *eda, | |||
| 327 | found = 1; | 324 | found = 1; |
| 328 | break; | 325 | break; |
| 329 | } else | 326 | } else |
| 330 | d_printf(6, dev, "EDA: looking for " | 327 | d_printf(6, dev, "EDA: looking for %pM against %pM miss\n", |
| 331 | "%02x:%02x:%02x:%02x:%02x:%02x " | 328 | virt_addr, itr->virt_addr); |
| 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]); | ||
| 340 | } | 329 | } |
| 341 | if (!found) { | 330 | if (!found) { |
| 342 | if (printk_ratelimit()) | 331 | if (printk_ratelimit()) |
| 343 | dev_err(dev, "EDA: Eth addr %02x:%02x:%02x" | 332 | dev_err(dev, "EDA: Eth addr %pM not found.\n", |
| 344 | ":%02x:%02x:%02x not found.\n", | 333 | virt_addr); |
| 345 | virt_addr[0], virt_addr[1], | ||
| 346 | virt_addr[2], virt_addr[3], | ||
| 347 | virt_addr[4], virt_addr[5]); | ||
| 348 | result = -ENODEV; | 334 | result = -ENODEV; |
| 349 | } | 335 | } |
| 350 | spin_unlock_irqrestore(&eda->lock, flags); | 336 | spin_unlock_irqrestore(&eda->lock, flags); |
| @@ -380,19 +366,13 @@ ssize_t wlp_eda_show(struct wlp *wlp, char *buf) | |||
| 380 | "tag state virt_addr\n"); | 366 | "tag state virt_addr\n"); |
| 381 | list_for_each_entry(entry, &eda->cache, list_node) { | 367 | list_for_each_entry(entry, &eda->cache, list_node) { |
| 382 | result += scnprintf(buf + result, PAGE_SIZE - result, | 368 | result += scnprintf(buf + result, PAGE_SIZE - result, |
| 383 | "%02x:%02x:%02x:%02x:%02x:%02x %02x:%02x " | 369 | "%pM %02x:%02x %p 0x%02x %s %pM\n", |
| 384 | "%p 0x%02x %s " | 370 | entry->eth_addr, |
| 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], | ||
| 389 | entry->dev_addr.data[1], | 371 | entry->dev_addr.data[1], |
| 390 | entry->dev_addr.data[0], entry->wss, | 372 | entry->dev_addr.data[0], entry->wss, |
| 391 | entry->tag, | 373 | entry->tag, |
| 392 | wlp_wss_connect_state_str(entry->state), | 374 | wlp_wss_connect_state_str(entry->state), |
| 393 | entry->virt_addr[0], entry->virt_addr[1], | 375 | entry->virt_addr); |
| 394 | entry->virt_addr[2], entry->virt_addr[3], | ||
| 395 | entry->virt_addr[4], entry->virt_addr[5]); | ||
| 396 | if (result >= PAGE_SIZE) | 376 | if (result >= PAGE_SIZE) |
| 397 | break; | 377 | break; |
| 398 | } | 378 | } |