Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c7ca992 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Felipe Balbi
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 974e9323

drivers/usb/gadget/f_ecm.c

+1 −4
Original line number Diff line number Diff line
@@ -897,10 +897,7 @@ ecm_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN]) 
		return -ENOMEM;



	/* export host's Ethernet address in CDC format */

	snprintf(ecm->ethaddr, sizeof ecm->ethaddr,

		"%02X%02X%02X%02X%02X%02X",

		ethaddr[0], ethaddr[1], ethaddr[2],

		ethaddr[3], ethaddr[4], ethaddr[5]);

	snprintf(ecm->ethaddr, sizeof ecm->ethaddr, "%pm", ethaddr);

	ecm_string_defs[1].s = ecm->ethaddr;



	ecm->port.cdc_filter = DEFAULT_FILTER;

drivers/usb/gadget/f_ncm.c

+1 −4
Original line number Diff line number Diff line
@@ -1346,10 +1346,7 @@ int __init ncm_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN]) 
		return -ENOMEM;



	/* export host's Ethernet address in CDC format */

	snprintf(ncm->ethaddr, sizeof ncm->ethaddr,

		"%02X%02X%02X%02X%02X%02X",

		ethaddr[0], ethaddr[1], ethaddr[2],

		ethaddr[3], ethaddr[4], ethaddr[5]);

	snprintf(ncm->ethaddr, sizeof ncm->ethaddr, "%pm", ethaddr);

	ncm_string_defs[1].s = ncm->ethaddr;



	spin_lock_init(&ncm->lock);

drivers/usb/gadget/f_subset.c

+1 −4
Original line number Diff line number Diff line
@@ -436,10 +436,7 @@ int geth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN]) 
		return -ENOMEM;



	/* export host's Ethernet address in CDC format */

	snprintf(geth->ethaddr, sizeof geth->ethaddr,

		"%02X%02X%02X%02X%02X%02X",

		ethaddr[0], ethaddr[1], ethaddr[2],

		ethaddr[3], ethaddr[4], ethaddr[5]);

	snprintf(geth->ethaddr, sizeof geth->ethaddr, "%pm", ethaddr);

	geth_string_defs[1].s = geth->ethaddr;



	geth->port.cdc_filter = DEFAULT_FILTER;