diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/atm/cxacru.c | 4 | ||||
-rw-r--r-- | drivers/usb/atm/usbatm.c | 5 | ||||
-rw-r--r-- | drivers/usb/gadget/u_ether.c | 6 |
3 files changed, 4 insertions, 11 deletions
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c index 9aea43a8c4ad..5ed4ae07bac1 100644 --- a/drivers/usb/atm/cxacru.c +++ b/drivers/usb/atm/cxacru.c | |||
@@ -286,9 +286,7 @@ static ssize_t cxacru_sysfs_show_mac_address(struct device *dev, | |||
286 | struct usbatm_data *usbatm_instance = usb_get_intfdata(intf); | 286 | struct usbatm_data *usbatm_instance = usb_get_intfdata(intf); |
287 | struct atm_dev *atm_dev = usbatm_instance->atm_dev; | 287 | struct atm_dev *atm_dev = usbatm_instance->atm_dev; |
288 | 288 | ||
289 | return snprintf(buf, PAGE_SIZE, "%02x:%02x:%02x:%02x:%02x:%02x\n", | 289 | return snprintf(buf, PAGE_SIZE, "%pM\n", atm_dev->esi); |
290 | atm_dev->esi[0], atm_dev->esi[1], atm_dev->esi[2], | ||
291 | atm_dev->esi[3], atm_dev->esi[4], atm_dev->esi[5]); | ||
292 | } | 290 | } |
293 | 291 | ||
294 | static ssize_t cxacru_sysfs_show_adsl_state(struct device *dev, | 292 | static ssize_t cxacru_sysfs_show_adsl_state(struct device *dev, |
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c index 06dd114910d4..fbea8563df1e 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c | |||
@@ -770,10 +770,7 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag | |||
770 | return sprintf(page, "%s\n", instance->description); | 770 | return sprintf(page, "%s\n", instance->description); |
771 | 771 | ||
772 | if (!left--) | 772 | if (!left--) |
773 | return sprintf(page, "MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", | 773 | return sprintf(page, "MAC: %pM\n", atm_dev->esi); |
774 | atm_dev->esi[0], atm_dev->esi[1], | ||
775 | atm_dev->esi[2], atm_dev->esi[3], | ||
776 | atm_dev->esi[4], atm_dev->esi[5]); | ||
777 | 774 | ||
778 | if (!left--) | 775 | if (!left--) |
779 | return sprintf(page, | 776 | return sprintf(page, |
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c index 66948b72bb9b..00fa5239879d 100644 --- a/drivers/usb/gadget/u_ether.c +++ b/drivers/usb/gadget/u_ether.c | |||
@@ -787,10 +787,8 @@ int __init gether_setup(struct usb_gadget *g, u8 ethaddr[ETH_ALEN]) | |||
787 | dev_dbg(&g->dev, "register_netdev failed, %d\n", status); | 787 | dev_dbg(&g->dev, "register_netdev failed, %d\n", status); |
788 | free_netdev(net); | 788 | free_netdev(net); |
789 | } else { | 789 | } else { |
790 | DECLARE_MAC_BUF(tmp); | 790 | INFO(dev, "MAC %pM\n", net->dev_addr); |
791 | 791 | INFO(dev, "HOST MAC %pM\n", dev->host_mac); | |
792 | INFO(dev, "MAC %s\n", print_mac(tmp, net->dev_addr)); | ||
793 | INFO(dev, "HOST MAC %s\n", print_mac(tmp, dev->host_mac)); | ||
794 | 792 | ||
795 | the_dev = dev; | 793 | the_dev = dev; |
796 | } | 794 | } |