diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 18:59:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:06:18 -0400 |
commit | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch) | |
tree | e8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/3c507.c | |
parent | 0c68ae2605dbcf67414d8d1f19af93be44b355fb (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/3c507.c')
-rw-r--r-- | drivers/net/3c507.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c index 030c147211ba..66fd505788f4 100644 --- a/drivers/net/3c507.c +++ b/drivers/net/3c507.c | |||
@@ -357,7 +357,6 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr) | |||
357 | static unsigned char init_ID_done, version_printed; | 357 | static unsigned char init_ID_done, version_printed; |
358 | int i, irq, irqval, retval; | 358 | int i, irq, irqval, retval; |
359 | struct net_local *lp; | 359 | struct net_local *lp; |
360 | DECLARE_MAC_BUF(mac); | ||
361 | 360 | ||
362 | if (init_ID_done == 0) { | 361 | if (init_ID_done == 0) { |
363 | ushort lrs_state = 0xff; | 362 | ushort lrs_state = 0xff; |
@@ -405,7 +404,7 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr) | |||
405 | outb(0x01, ioaddr + MISC_CTRL); | 404 | outb(0x01, ioaddr + MISC_CTRL); |
406 | for (i = 0; i < 6; i++) | 405 | for (i = 0; i < 6; i++) |
407 | dev->dev_addr[i] = inb(ioaddr + i); | 406 | dev->dev_addr[i] = inb(ioaddr + i); |
408 | printk(" %s", print_mac(mac, dev->dev_addr)); | 407 | printk(" %pM", dev->dev_addr); |
409 | 408 | ||
410 | if (mem_start) | 409 | if (mem_start) |
411 | net_debug = mem_start & 7; | 410 | net_debug = mem_start & 7; |