diff options
author | Joe Perches <joe@perches.com> | 2007-10-03 20:59:30 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:42 -0400 |
commit | 0795af5729b18218767fab27c44b1384f72dc9ad (patch) | |
tree | 67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/usb | |
parent | 95ea36275f3c9a1d3d04c217b4b576c657c4e70e (diff) |
[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()
This is nicer than the MAC_FMT stuff.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/pegasus.c | 11 | ||||
-rw-r--r-- | drivers/net/usb/usbnet.c | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index 432a2f054468..d1ed68a11e70 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c | |||
@@ -1297,6 +1297,7 @@ static int pegasus_probe(struct usb_interface *intf, | |||
1297 | pegasus_t *pegasus; | 1297 | pegasus_t *pegasus; |
1298 | int dev_index = id - pegasus_ids; | 1298 | int dev_index = id - pegasus_ids; |
1299 | int res = -ENOMEM; | 1299 | int res = -ENOMEM; |
1300 | DECLARE_MAC_BUF(mac); | ||
1300 | 1301 | ||
1301 | usb_get_dev(dev); | 1302 | usb_get_dev(dev); |
1302 | net = alloc_etherdev(sizeof(struct pegasus)); | 1303 | net = alloc_etherdev(sizeof(struct pegasus)); |
@@ -1367,12 +1368,10 @@ static int pegasus_probe(struct usb_interface *intf, | |||
1367 | queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check, | 1368 | queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check, |
1368 | CARRIER_CHECK_DELAY); | 1369 | CARRIER_CHECK_DELAY); |
1369 | 1370 | ||
1370 | dev_info(&intf->dev, "%s, %s, %02x:%02x:%02x:%02x:%02x:%02x\n", | 1371 | dev_info(&intf->dev, "%s, %s, %s\n", |
1371 | net->name, | 1372 | net->name, |
1372 | usb_dev_id[dev_index].name, | 1373 | usb_dev_id[dev_index].name, |
1373 | net->dev_addr [0], net->dev_addr [1], | 1374 | print_mac(mac, net->dev_addr)); |
1374 | net->dev_addr [2], net->dev_addr [3], | ||
1375 | net->dev_addr [4], net->dev_addr [5]); | ||
1376 | return 0; | 1375 | return 0; |
1377 | 1376 | ||
1378 | out3: | 1377 | out3: |
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 3542ca5fb0fa..acd5f1c0e63a 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
@@ -1134,6 +1134,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) | |||
1134 | struct usb_device *xdev; | 1134 | struct usb_device *xdev; |
1135 | int status; | 1135 | int status; |
1136 | const char *name; | 1136 | const char *name; |
1137 | DECLARE_MAC_BUF(mac); | ||
1137 | 1138 | ||
1138 | name = udev->dev.driver->name; | 1139 | name = udev->dev.driver->name; |
1139 | info = (struct driver_info *) prod->driver_info; | 1140 | info = (struct driver_info *) prod->driver_info; |
@@ -1241,14 +1242,11 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) | |||
1241 | if (status) | 1242 | if (status) |
1242 | goto out3; | 1243 | goto out3; |
1243 | if (netif_msg_probe (dev)) | 1244 | if (netif_msg_probe (dev)) |
1244 | devinfo (dev, "register '%s' at usb-%s-%s, %s, " | 1245 | devinfo (dev, "register '%s' at usb-%s-%s, %s, %s", |
1245 | "%02x:%02x:%02x:%02x:%02x:%02x", | ||
1246 | udev->dev.driver->name, | 1246 | udev->dev.driver->name, |
1247 | xdev->bus->bus_name, xdev->devpath, | 1247 | xdev->bus->bus_name, xdev->devpath, |
1248 | dev->driver_info->description, | 1248 | dev->driver_info->description, |
1249 | net->dev_addr [0], net->dev_addr [1], | 1249 | print_mac(mac, net->dev_addr)); |
1250 | net->dev_addr [2], net->dev_addr [3], | ||
1251 | net->dev_addr [4], net->dev_addr [5]); | ||
1252 | 1250 | ||
1253 | // ok, it's ready to go. | 1251 | // ok, it's ready to go. |
1254 | usb_set_intfdata (udev, dev); | 1252 | usb_set_intfdata (udev, dev); |