aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ibmlana.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-27 18:59:26 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-27 20:06:18 -0400
commite174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch)
treee8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/ibmlana.c
parent0c68ae2605dbcf67414d8d1f19af93be44b355fb (diff)
net: convert print_mac to %pM
This converts pretty much everything to print_mac. There were a few things that had conflicts which I have just dropped for now, no harm done. I've built an allyesconfig with this and looked at the files that weren't built very carefully, but it's a huge patch. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ibmlana.c')
-rw-r--r--drivers/net/ibmlana.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index f02764725a22..0fad08c4ccd2 100644
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -914,7 +914,6 @@ static int __devinit ibmlana_init_one(struct device *kdev)
914 int base = 0, irq = 0, iobase = 0, memlen = 0; 914 int base = 0, irq = 0, iobase = 0, memlen = 0;
915 ibmlana_priv *priv; 915 ibmlana_priv *priv;
916 ibmlana_medium medium; 916 ibmlana_medium medium;
917 DECLARE_MAC_BUF(mac);
918 917
919 dev = alloc_etherdev(sizeof(ibmlana_priv)); 918 dev = alloc_etherdev(sizeof(ibmlana_priv));
920 if (!dev) 919 if (!dev)
@@ -990,10 +989,10 @@ static int __devinit ibmlana_init_one(struct device *kdev)
990 /* print config */ 989 /* print config */
991 990
992 printk(KERN_INFO "%s: IRQ %d, I/O %#lx, memory %#lx-%#lx, " 991 printk(KERN_INFO "%s: IRQ %d, I/O %#lx, memory %#lx-%#lx, "
993 "MAC address %s.\n", 992 "MAC address %pM.\n",
994 dev->name, priv->realirq, dev->base_addr, 993 dev->name, priv->realirq, dev->base_addr,
995 dev->mem_start, dev->mem_end - 1, 994 dev->mem_start, dev->mem_end - 1,
996 print_mac(mac, dev->dev_addr)); 995 dev->dev_addr);
997 printk(KERN_INFO "%s: %s medium\n", dev->name, MediaNames[priv->medium]); 996 printk(KERN_INFO "%s: %s medium\n", dev->name, MediaNames[priv->medium]);
998 997
999 /* reset board */ 998 /* reset board */