diff options
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/pegasus.c | 5 | ||||
-rw-r--r-- | drivers/net/usb/smsc95xx.c | 4 | ||||
-rw-r--r-- | drivers/net/usb/usbnet.c | 5 |
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, | |||
1309 | pegasus_t *pegasus; | 1309 | pegasus_t *pegasus; |
1310 | int dev_index = id - pegasus_ids; | 1310 | int dev_index = id - pegasus_ids; |
1311 | int res = -ENOMEM; | 1311 | int res = -ENOMEM; |
1312 | DECLARE_MAC_BUF(mac); | ||
1313 | 1312 | ||
1314 | usb_get_dev(dev); | 1313 | usb_get_dev(dev); |
1315 | 1314 | ||
@@ -1386,10 +1385,10 @@ static int pegasus_probe(struct usb_interface *intf, | |||
1386 | queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check, | 1385 | queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check, |
1387 | CARRIER_CHECK_DELAY); | 1386 | CARRIER_CHECK_DELAY); |
1388 | 1387 | ||
1389 | dev_info(&intf->dev, "%s, %s, %s\n", | 1388 | dev_info(&intf->dev, "%s, %s, %pM\n", |
1390 | net->name, | 1389 | net->name, |
1391 | usb_dev_id[dev_index].name, | 1390 | usb_dev_id[dev_index].name, |
1392 | print_mac(mac, net->dev_addr)); | 1391 | net->dev_addr); |
1393 | return 0; | 1392 | return 0; |
1394 | 1393 | ||
1395 | out3: | 1394 | 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) | |||
759 | struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]); | 759 | struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]); |
760 | u32 read_buf, write_buf, burst_cap; | 760 | u32 read_buf, write_buf, burst_cap; |
761 | int ret = 0, timeout; | 761 | int ret = 0, timeout; |
762 | DECLARE_MAC_BUF(mac); | ||
763 | 762 | ||
764 | if (netif_msg_ifup(dev)) | 763 | if (netif_msg_ifup(dev)) |
765 | devdbg(dev, "entering smsc95xx_reset"); | 764 | devdbg(dev, "entering smsc95xx_reset"); |
@@ -818,8 +817,7 @@ static int smsc95xx_reset(struct usbnet *dev) | |||
818 | return ret; | 817 | return ret; |
819 | 818 | ||
820 | if (netif_msg_ifup(dev)) | 819 | if (netif_msg_ifup(dev)) |
821 | devdbg(dev, "MAC Address: %s", | 820 | devdbg(dev, "MAC Address: %pM", dev->net->dev_addr); |
822 | print_mac(mac, dev->net->dev_addr)); | ||
823 | 821 | ||
824 | ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf); | 822 | ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf); |
825 | if (ret < 0) { | 823 | 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) | |||
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); |