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

Commit 7c510e4b authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

net: convert more to %pM 



A number of places still use %02x:...:%02x because it's
in debug statements or for no real reason. Make a few
of them use %pM.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e174961c

arch/sparc64/kernel/idprom.c

+1 −4
Original line number Diff line number Diff line
@@ -42,8 +42,5 @@ void __init idprom_init(void) 
			    idprom->id_cksum, calc_idprom_cksum(idprom));

	}



	printk("Ethernet address: %02x:%02x:%02x:%02x:%02x:%02x\n",

	       idprom->id_ethaddr[0], idprom->id_ethaddr[1],

	       idprom->id_ethaddr[2], idprom->id_ethaddr[3],

	       idprom->id_ethaddr[4], idprom->id_ethaddr[5]);

	printk("Ethernet address: %pM\n", idprom->id_ethaddr);

}

arch/um/drivers/net_kern.c

+1 −6
Original line number Diff line number Diff line
@@ -418,12 +418,7 @@ static void eth_configure(int n, void *init, char *mac, 


	setup_etheraddr(mac, device->mac, dev->name);



	printk(KERN_INFO "Netdevice %d ", n);

	printk("(%02x:%02x:%02x:%02x:%02x:%02x) ",

	       device->mac[0], device->mac[1],

	       device->mac[2], device->mac[3],

	       device->mac[4], device->mac[5]);

	printk(": ");

	printk(KERN_INFO "Netdevice %d (%pM) : ", n, device->mac);



	lp = dev->priv;

	/* This points to the transport private data. It's still clear, but we

arch/xtensa/platforms/iss/network.c

+1 −4
Original line number Diff line number Diff line
@@ -660,10 +660,7 @@ static int iss_net_configure(int index, char *init) 


	printk(KERN_INFO "Netdevice %d ", index);

	if (lp->have_mac)

		printk("(%02x:%02x:%02x:%02x:%02x:%02x) ",

				lp->mac[0], lp->mac[1],

				lp->mac[2], lp->mac[3],

				lp->mac[4], lp->mac[5]);

		printk("(%pM) ", lp->mac);

	printk(": ");



	/* sysfs register */

drivers/media/dvb/b2c2/flexcop.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ int flexcop_device_initialize(struct flexcop_device *fc) 
	/* do the MAC address reading after initializing the dvb_adapter */

	if (fc->get_mac_addr(fc, 0) == 0) {

		u8 *b = fc->dvb_adapter.proposed_mac;

		info("MAC address = %02x:%02x:%02x:%02x:%02x:%02x", b[0],b[1],b[2],b[3],b[4],b[5]);

		info("MAC address = %pM", b);

		flexcop_set_mac_filter(fc,b);

		flexcop_mac_filter_ctrl(fc,1);

	} else

drivers/media/dvb/bt8xx/dst.c

+1 −3
Original line number Diff line number Diff line
@@ -917,9 +917,7 @@ static int dst_get_mac(struct dst_state *state) 
	}

	memset(&state->mac_address, '\0', 8);

	memcpy(&state->mac_address, &state->rxbuffer, 6);

	dprintk(verbose, DST_ERROR, 1, "MAC Address=[%02x:%02x:%02x:%02x:%02x:%02x]",

		state->mac_address[0], state->mac_address[1], state->mac_address[2],

		state->mac_address[4], state->mac_address[5], state->mac_address[6]);

	dprintk(verbose, DST_ERROR, 1, "MAC Address=[%pM]", state->mac_address);



	return 0;

}