diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 18:59:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:06:18 -0400 |
commit | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch) | |
tree | e8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/usb/usbnet.c | |
parent | 0c68ae2605dbcf67414d8d1f19af93be44b355fb (diff) |
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>
Diffstat (limited to 'drivers/net/usb/usbnet.c')
-rw-r--r-- | drivers/net/usb/usbnet.c | 5 |
1 files changed, 2 insertions, 3 deletions
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) | |||
1125 | struct usb_device *xdev; | 1125 | struct usb_device *xdev; |
1126 | int status; | 1126 | int status; |
1127 | const char *name; | 1127 | const char *name; |
1128 | DECLARE_MAC_BUF(mac); | ||
1129 | 1128 | ||
1130 | name = udev->dev.driver->name; | 1129 | name = udev->dev.driver->name; |
1131 | info = (struct driver_info *) prod->driver_info; | 1130 | info = (struct driver_info *) prod->driver_info; |
@@ -1236,11 +1235,11 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) | |||
1236 | if (status) | 1235 | if (status) |
1237 | goto out3; | 1236 | goto out3; |
1238 | if (netif_msg_probe (dev)) | 1237 | if (netif_msg_probe (dev)) |
1239 | devinfo (dev, "register '%s' at usb-%s-%s, %s, %s", | 1238 | devinfo (dev, "register '%s' at usb-%s-%s, %s, %pM", |
1240 | udev->dev.driver->name, | 1239 | udev->dev.driver->name, |
1241 | xdev->bus->bus_name, xdev->devpath, | 1240 | xdev->bus->bus_name, xdev->devpath, |
1242 | dev->driver_info->description, | 1241 | dev->driver_info->description, |
1243 | print_mac(mac, net->dev_addr)); | 1242 | net->dev_addr); |
1244 | 1243 | ||
1245 | // ok, it's ready to go. | 1244 | // ok, it's ready to go. |
1246 | usb_set_intfdata (udev, dev); | 1245 | usb_set_intfdata (udev, dev); |