net: convert print_mac to %pM

This converts pretty much everything to print_mac. There were
a few things that had conflicts which I have just dropped for
now, no harm done.

I've built an allyesconfig with this and looked at the files
that weren't built very carefully, but it's a huge patch.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 5 insertions, 9 deletions

diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 7914867110ed..c073929c4d75 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1309,7 +1309,6 @@ static int pegasus_probe(struct usb_interface *intf,
         pegasus_t *pegasus;
         int dev_index = id - pegasus_ids;
         int res = -ENOMEM;
-        DECLARE_MAC_BUF(mac);
 
         usb_get_dev(dev);
 
@@ -1386,10 +1385,10 @@ static int pegasus_probe(struct usb_interface *intf,
         queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
                                 CARRIER_CHECK_DELAY);
 
-        dev_info(&intf->dev, "%s, %s, %s\n",
+        dev_info(&intf->dev, "%s, %s, %pM\n",
                  net->name,
                  usb_dev_id[dev_index].name,
-                 print_mac(mac, net->dev_addr));
+                 net->dev_addr);
         return 0;
 
 out3:
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 51e2f5d7d14e..e0d349f74642 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -759,7 +759,6 @@ static int smsc95xx_reset(struct usbnet *dev)
         struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
         u32 read_buf, write_buf, burst_cap;
         int ret = 0, timeout;
-        DECLARE_MAC_BUF(mac);
 
         if (netif_msg_ifup(dev))
                 devdbg(dev, "entering smsc95xx_reset");
@@ -818,8 +817,7 @@ static int smsc95xx_reset(struct usbnet *dev)
                 return ret;
 
         if (netif_msg_ifup(dev))
-                devdbg(dev, "MAC Address: %s",
-                        print_mac(mac, dev->net->dev_addr));
+                devdbg(dev, "MAC Address: %pM", dev->net->dev_addr);
 
         ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
         if (ret < 0) {
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 02d25c743994..aa3149078888 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1125,7 +1125,6 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
         struct usb_device               *xdev;
         int                             status;
         const char                      *name;
-        DECLARE_MAC_BUF(mac);
 
         name = udev->dev.driver->name;
         info = (struct driver_info *) prod->driver_info;
@@ -1236,11 +1235,11 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
         if (status)
                 goto out3;
         if (netif_msg_probe (dev))
-                devinfo (dev, "register '%s' at usb-%s-%s, %s, %s",
+                devinfo (dev, "register '%s' at usb-%s-%s, %s, %pM",
                         udev->dev.driver->name,
                         xdev->bus->bus_name, xdev->devpath,
                         dev->driver_info->description,
-                        print_mac(mac, net->dev_addr));
+                        net->dev_addr);
 
         // ok, it's ready to go.
         usb_set_intfdata (udev, dev);