diff options
author | Andy Shevchenko <andy.shevchenko@gmail.com> | 2010-09-12 04:16:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-13 23:02:54 -0400 |
commit | bc0ed0be10a4925efa7b81a84af53f12fbdbcb4e (patch) | |
tree | 9de34df13bc04ea444d8fecb82ca92e3f9ccfea1 /drivers | |
parent | 251415808306a19be93ec93268e2985f10d3db8b (diff) |
uwb: use '%pM' format to print MAC address
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/uwb/address.c | 5 | ||||
-rw-r--r-- | drivers/uwb/wlp/wss-lc.c | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/uwb/address.c b/drivers/uwb/address.c index 973321327c44..8739c4f4d015 100644 --- a/drivers/uwb/address.c +++ b/drivers/uwb/address.c | |||
@@ -363,10 +363,7 @@ size_t __uwb_addr_print(char *buf, size_t buf_size, const unsigned char *addr, | |||
363 | { | 363 | { |
364 | size_t result; | 364 | size_t result; |
365 | if (type) | 365 | if (type) |
366 | result = scnprintf(buf, buf_size, | 366 | result = scnprintf(buf, buf_size, "%pM", addr); |
367 | "%02x:%02x:%02x:%02x:%02x:%02x", | ||
368 | addr[0], addr[1], addr[2], | ||
369 | addr[3], addr[4], addr[5]); | ||
370 | else | 367 | else |
371 | result = scnprintf(buf, buf_size, "%02x:%02x", | 368 | result = scnprintf(buf, buf_size, "%02x:%02x", |
372 | addr[1], addr[0]); | 369 | addr[1], addr[0]); |
diff --git a/drivers/uwb/wlp/wss-lc.c b/drivers/uwb/wlp/wss-lc.c index a005d2a03b5d..67872c83b679 100644 --- a/drivers/uwb/wlp/wss-lc.c +++ b/drivers/uwb/wlp/wss-lc.c | |||
@@ -791,11 +791,8 @@ int wlp_wss_prep_hdr(struct wlp *wlp, struct wlp_eda_node *eda_entry, | |||
791 | } else { | 791 | } else { |
792 | if (printk_ratelimit()) | 792 | if (printk_ratelimit()) |
793 | dev_err(dev, "WLP: Destination neighbor (Ethernet: " | 793 | dev_err(dev, "WLP: Destination neighbor (Ethernet: " |
794 | "%02x:%02x:%02x:%02x:%02x:%02x, Dev: " | 794 | "%pM, Dev: %02x:%02x) is not connected.\n", |
795 | "%02x:%02x) is not connected. \n", eth_addr[0], | 795 | eth_addr, dev_addr->data[1], dev_addr->data[0]); |
796 | eth_addr[1], eth_addr[2], eth_addr[3], | ||
797 | eth_addr[4], eth_addr[5], dev_addr->data[1], | ||
798 | dev_addr->data[0]); | ||
799 | result = -EINVAL; | 796 | result = -EINVAL; |
800 | } | 797 | } |
801 | return result; | 798 | return result; |