aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2012-07-06 11:30:21 -0400
committerFelipe Balbi <balbi@ti.com>2012-08-23 04:04:20 -0400
commit8c7ca99250de69dfe97c5f4f6e2eb11dc6145779 (patch)
tree6580bd515aff40c1959141d4bfa44091f80948bc /drivers/usb/gadget
parent974e9323deefbab923d7aa8f0e4bcf9066c2ec97 (diff)
usb: gadget: use %pm to print mac addresses
%pm already provides pretty print for mac addresses, let's use that and drop homebrew mac address printing. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r--drivers/usb/gadget/f_ecm.c5
-rw-r--r--drivers/usb/gadget/f_ncm.c5
-rw-r--r--drivers/usb/gadget/f_subset.c5
3 files changed, 3 insertions, 12 deletions
diff --git a/drivers/usb/gadget/f_ecm.c b/drivers/usb/gadget/f_ecm.c
index 30b908f2a53d..95bc94f8e570 100644
--- a/drivers/usb/gadget/f_ecm.c
+++ b/drivers/usb/gadget/f_ecm.c
@@ -897,10 +897,7 @@ ecm_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
897 return -ENOMEM; 897 return -ENOMEM;
898 898
899 /* export host's Ethernet address in CDC format */ 899 /* export host's Ethernet address in CDC format */
900 snprintf(ecm->ethaddr, sizeof ecm->ethaddr, 900 snprintf(ecm->ethaddr, sizeof ecm->ethaddr, "%pm", ethaddr);
901 "%02X%02X%02X%02X%02X%02X",
902 ethaddr[0], ethaddr[1], ethaddr[2],
903 ethaddr[3], ethaddr[4], ethaddr[5]);
904 ecm_string_defs[1].s = ecm->ethaddr; 901 ecm_string_defs[1].s = ecm->ethaddr;
905 902
906 ecm->port.cdc_filter = DEFAULT_FILTER; 903 ecm->port.cdc_filter = DEFAULT_FILTER;
diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
index aab8eded045b..b651b529c67f 100644
--- a/drivers/usb/gadget/f_ncm.c
+++ b/drivers/usb/gadget/f_ncm.c
@@ -1346,10 +1346,7 @@ int __init ncm_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
1346 return -ENOMEM; 1346 return -ENOMEM;
1347 1347
1348 /* export host's Ethernet address in CDC format */ 1348 /* export host's Ethernet address in CDC format */
1349 snprintf(ncm->ethaddr, sizeof ncm->ethaddr, 1349 snprintf(ncm->ethaddr, sizeof ncm->ethaddr, "%pm", ethaddr);
1350 "%02X%02X%02X%02X%02X%02X",
1351 ethaddr[0], ethaddr[1], ethaddr[2],
1352 ethaddr[3], ethaddr[4], ethaddr[5]);
1353 ncm_string_defs[1].s = ncm->ethaddr; 1350 ncm_string_defs[1].s = ncm->ethaddr;
1354 1351
1355 spin_lock_init(&ncm->lock); 1352 spin_lock_init(&ncm->lock);
diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c
index 21ab474aca07..4060c0bd9785 100644
--- a/drivers/usb/gadget/f_subset.c
+++ b/drivers/usb/gadget/f_subset.c
@@ -436,10 +436,7 @@ int geth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
436 return -ENOMEM; 436 return -ENOMEM;
437 437
438 /* export host's Ethernet address in CDC format */ 438 /* export host's Ethernet address in CDC format */
439 snprintf(geth->ethaddr, sizeof geth->ethaddr, 439 snprintf(geth->ethaddr, sizeof geth->ethaddr, "%pm", ethaddr);
440 "%02X%02X%02X%02X%02X%02X",
441 ethaddr[0], ethaddr[1], ethaddr[2],
442 ethaddr[3], ethaddr[4], ethaddr[5]);
443 geth_string_defs[1].s = geth->ethaddr; 440 geth_string_defs[1].s = geth->ethaddr;
444 441
445 geth->port.cdc_filter = DEFAULT_FILTER; 442 geth->port.cdc_filter = DEFAULT_FILTER;