From 959b013a400cfe7672e916190e729ef32461a3cf Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko@gmail.com>
Date: Sun, 12 Sep 2010 08:16:26 +0000
Subject: [PATCH] --- yaml --- r: 214512 b: refs/heads/master c:
 bc0ed0be10a4925efa7b81a84af53f12fbdbcb4e h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/uwb/address.c    | 5 +----
 trunk/drivers/uwb/wlp/wss-lc.c | 7 ++-----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 2cd76c8c0fa0..2649f617fe1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 251415808306a19be93ec93268e2985f10d3db8b
+refs/heads/master: bc0ed0be10a4925efa7b81a84af53f12fbdbcb4e
diff --git a/trunk/drivers/uwb/address.c b/trunk/drivers/uwb/address.c
index 973321327c44..8739c4f4d015 100644
--- a/trunk/drivers/uwb/address.c
+++ b/trunk/drivers/uwb/address.c
@@ -363,10 +363,7 @@ size_t __uwb_addr_print(char *buf, size_t buf_size, const unsigned char *addr,
 {
 	size_t result;
 	if (type)
-		result = scnprintf(buf, buf_size,
-				  "%02x:%02x:%02x:%02x:%02x:%02x",
-				  addr[0], addr[1], addr[2],
-				  addr[3], addr[4], addr[5]);
+		result = scnprintf(buf, buf_size, "%pM", addr);
 	else
 		result = scnprintf(buf, buf_size, "%02x:%02x",
 				  addr[1], addr[0]);
diff --git a/trunk/drivers/uwb/wlp/wss-lc.c b/trunk/drivers/uwb/wlp/wss-lc.c
index a005d2a03b5d..67872c83b679 100644
--- a/trunk/drivers/uwb/wlp/wss-lc.c
+++ b/trunk/drivers/uwb/wlp/wss-lc.c
@@ -791,11 +791,8 @@ int wlp_wss_prep_hdr(struct wlp *wlp, struct wlp_eda_node *eda_entry,
 	} else {
 		if (printk_ratelimit())
 			dev_err(dev, "WLP: Destination neighbor (Ethernet: "
-				"%02x:%02x:%02x:%02x:%02x:%02x, Dev: "
-				"%02x:%02x) is not connected. \n", eth_addr[0],
-				eth_addr[1], eth_addr[2], eth_addr[3],
-				eth_addr[4], eth_addr[5], dev_addr->data[1],
-				dev_addr->data[0]);
+				"%pM, Dev: %02x:%02x) is not connected.\n",
+				eth_addr, dev_addr->data[1], dev_addr->data[0]);
 		result = -EINVAL;
 	}
 	return result;