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/3c505.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/3c505.c')
-rw-r--r-- | drivers/net/3c505.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c index a424869707a5..6ecb4188b451 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/3c505.c | |||
@@ -1385,7 +1385,6 @@ static int __init elplus_setup(struct net_device *dev) | |||
1385 | unsigned long timeout; | 1385 | unsigned long timeout; |
1386 | unsigned long cookie = 0; | 1386 | unsigned long cookie = 0; |
1387 | int err = -ENODEV; | 1387 | int err = -ENODEV; |
1388 | DECLARE_MAC_BUF(mac); | ||
1389 | 1388 | ||
1390 | /* | 1389 | /* |
1391 | * setup adapter structure | 1390 | * setup adapter structure |
@@ -1522,9 +1521,9 @@ static int __init elplus_setup(struct net_device *dev) | |||
1522 | * print remainder of startup message | 1521 | * print remainder of startup message |
1523 | */ | 1522 | */ |
1524 | printk(KERN_INFO "%s: 3c505 at %#lx, irq %d, dma %d, " | 1523 | printk(KERN_INFO "%s: 3c505 at %#lx, irq %d, dma %d, " |
1525 | "addr %s, ", | 1524 | "addr %pM, ", |
1526 | dev->name, dev->base_addr, dev->irq, dev->dma, | 1525 | dev->name, dev->base_addr, dev->irq, dev->dma, |
1527 | print_mac(mac, dev->dev_addr)); | 1526 | dev->dev_addr); |
1528 | 1527 | ||
1529 | /* | 1528 | /* |
1530 | * read more information from the adapter | 1529 | * read more information from the adapter |