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/3c509.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/3c509.c')
-rw-r--r-- | drivers/net/3c509.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index 3a7bc524af33..cc970c49fb34 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c | |||
@@ -541,7 +541,6 @@ static int __init el3_common_init(struct net_device *dev) | |||
541 | { | 541 | { |
542 | struct el3_private *lp = netdev_priv(dev); | 542 | struct el3_private *lp = netdev_priv(dev); |
543 | int err; | 543 | int err; |
544 | DECLARE_MAC_BUF(mac); | ||
545 | const char *if_names[] = {"10baseT", "AUI", "undefined", "BNC"}; | 544 | const char *if_names[] = {"10baseT", "AUI", "undefined", "BNC"}; |
546 | 545 | ||
547 | spin_lock_init(&lp->lock); | 546 | spin_lock_init(&lp->lock); |
@@ -575,9 +574,9 @@ static int __init el3_common_init(struct net_device *dev) | |||
575 | } | 574 | } |
576 | 575 | ||
577 | printk(KERN_INFO "%s: 3c5x9 found at %#3.3lx, %s port, " | 576 | printk(KERN_INFO "%s: 3c5x9 found at %#3.3lx, %s port, " |
578 | "address %s, IRQ %d.\n", | 577 | "address %pM, IRQ %d.\n", |
579 | dev->name, dev->base_addr, if_names[(dev->if_port & 0x03)], | 578 | dev->name, dev->base_addr, if_names[(dev->if_port & 0x03)], |
580 | print_mac(mac, dev->dev_addr), dev->irq); | 579 | dev->dev_addr, dev->irq); |
581 | 580 | ||
582 | if (el3_debug > 0) | 581 | if (el3_debug > 0) |
583 | printk(KERN_INFO "%s", version); | 582 | printk(KERN_INFO "%s", version); |