net: convert print_mac to %pM

[deliverable/linux.git] / drivers / net / usb / usbnet.c

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 8463efb9e0b119417b8199c78c53d6a0151ffe43..aa31490788880bb3b609acae0a9ab7332cce28c7 100644 (file)
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -512,14 +512,13 @@ static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q)
        int                     count = 0;
 
        spin_lock_irqsave (&q->lock, flags);
-       for (skb = q->next; skb != (struct sk_buff *) q; skb = skbnext) {
+       skb_queue_walk_safe(q, skb, skbnext) {
                struct skb_data         *entry;
                struct urb              *urb;
                int                     retval;
 
                entry = (struct skb_data *) skb->cb;
                urb = entry->urb;
-               skbnext = skb->next;
 
                // during some PM-driven resume scenarios,
                // these (async) unlinks complete immediately
@@ -1126,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;
@@ -1237,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);