diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 20:47:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:47:26 -0400 |
commit | 7c510e4b730a92cecf94ada45c989d8be0200d47 (patch) | |
tree | 61f1926964c580946367588602a8eb039561f077 /arch | |
parent | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (diff) |
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: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc64/kernel/idprom.c | 5 | ||||
-rw-r--r-- | arch/um/drivers/net_kern.c | 7 | ||||
-rw-r--r-- | arch/xtensa/platforms/iss/network.c | 5 |
3 files changed, 3 insertions, 14 deletions
diff --git a/arch/sparc64/kernel/idprom.c b/arch/sparc64/kernel/idprom.c index 5b45a808c621..a62ff83337cd 100644 --- a/arch/sparc64/kernel/idprom.c +++ b/arch/sparc64/kernel/idprom.c | |||
@@ -42,8 +42,5 @@ void __init idprom_init(void) | |||
42 | idprom->id_cksum, calc_idprom_cksum(idprom)); | 42 | idprom->id_cksum, calc_idprom_cksum(idprom)); |
43 | } | 43 | } |
44 | 44 | ||
45 | printk("Ethernet address: %02x:%02x:%02x:%02x:%02x:%02x\n", | 45 | printk("Ethernet address: %pM\n", idprom->id_ethaddr); |
46 | idprom->id_ethaddr[0], idprom->id_ethaddr[1], | ||
47 | idprom->id_ethaddr[2], idprom->id_ethaddr[3], | ||
48 | idprom->id_ethaddr[4], idprom->id_ethaddr[5]); | ||
49 | } | 46 | } |
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index 5b4ca8d93682..74f1a1787026 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c | |||
@@ -418,12 +418,7 @@ static void eth_configure(int n, void *init, char *mac, | |||
418 | 418 | ||
419 | setup_etheraddr(mac, device->mac, dev->name); | 419 | setup_etheraddr(mac, device->mac, dev->name); |
420 | 420 | ||
421 | printk(KERN_INFO "Netdevice %d ", n); | 421 | printk(KERN_INFO "Netdevice %d (%pM) : ", n, device->mac); |
422 | printk("(%02x:%02x:%02x:%02x:%02x:%02x) ", | ||
423 | device->mac[0], device->mac[1], | ||
424 | device->mac[2], device->mac[3], | ||
425 | device->mac[4], device->mac[5]); | ||
426 | printk(": "); | ||
427 | 422 | ||
428 | lp = dev->priv; | 423 | lp = dev->priv; |
429 | /* This points to the transport private data. It's still clear, but we | 424 | /* This points to the transport private data. It's still clear, but we |
diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c index 11a20adc1409..87f47cade013 100644 --- a/arch/xtensa/platforms/iss/network.c +++ b/arch/xtensa/platforms/iss/network.c | |||
@@ -660,10 +660,7 @@ static int iss_net_configure(int index, char *init) | |||
660 | 660 | ||
661 | printk(KERN_INFO "Netdevice %d ", index); | 661 | printk(KERN_INFO "Netdevice %d ", index); |
662 | if (lp->have_mac) | 662 | if (lp->have_mac) |
663 | printk("(%02x:%02x:%02x:%02x:%02x:%02x) ", | 663 | printk("(%pM) ", lp->mac); |
664 | lp->mac[0], lp->mac[1], | ||
665 | lp->mac[2], lp->mac[3], | ||
666 | lp->mac[4], lp->mac[5]); | ||
667 | printk(": "); | 664 | printk(": "); |
668 | 665 | ||
669 | /* sysfs register */ | 666 | /* sysfs register */ |