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/3c523.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/3c523.c')
-rw-r--r-- | drivers/net/3c523.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c index e2ce41d3828e..23a31232326c 100644 --- a/drivers/net/3c523.c +++ b/drivers/net/3c523.c | |||
@@ -383,7 +383,6 @@ static int elmc_getinfo(char *buf, int slot, void *d) | |||
383 | { | 383 | { |
384 | int len = 0; | 384 | int len = 0; |
385 | struct net_device *dev = d; | 385 | struct net_device *dev = d; |
386 | DECLARE_MAC_BUF(mac); | ||
387 | 386 | ||
388 | if (dev == NULL) | 387 | if (dev == NULL) |
389 | return len; | 388 | return len; |
@@ -398,8 +397,8 @@ static int elmc_getinfo(char *buf, int slot, void *d) | |||
398 | len += sprintf(buf + len, "Transceiver: %s\n", dev->if_port ? | 397 | len += sprintf(buf + len, "Transceiver: %s\n", dev->if_port ? |
399 | "External" : "Internal"); | 398 | "External" : "Internal"); |
400 | len += sprintf(buf + len, "Device: %s\n", dev->name); | 399 | len += sprintf(buf + len, "Device: %s\n", dev->name); |
401 | len += sprintf(buf + len, "Hardware Address: %s\n", | 400 | len += sprintf(buf + len, "Hardware Address: %pM\n", |
402 | print_mac(mac, dev->dev_addr)); | 401 | dev->dev_addr); |
403 | 402 | ||
404 | return len; | 403 | return len; |
405 | } /* elmc_getinfo() */ | 404 | } /* elmc_getinfo() */ |
@@ -417,7 +416,6 @@ static int __init do_elmc_probe(struct net_device *dev) | |||
417 | unsigned int size = 0; | 416 | unsigned int size = 0; |
418 | int retval; | 417 | int retval; |
419 | struct priv *pr = dev->priv; | 418 | struct priv *pr = dev->priv; |
420 | DECLARE_MAC_BUF(mac); | ||
421 | 419 | ||
422 | if (MCA_bus == 0) { | 420 | if (MCA_bus == 0) { |
423 | return -ENODEV; | 421 | return -ENODEV; |
@@ -543,8 +541,8 @@ static int __init do_elmc_probe(struct net_device *dev) | |||
543 | for (i = 0; i < 6; i++) | 541 | for (i = 0; i < 6; i++) |
544 | dev->dev_addr[i] = inb(dev->base_addr + i); | 542 | dev->dev_addr[i] = inb(dev->base_addr + i); |
545 | 543 | ||
546 | printk(KERN_INFO "%s: hardware address %s\n", | 544 | printk(KERN_INFO "%s: hardware address %pM\n", |
547 | dev->name, print_mac(mac, dev->dev_addr)); | 545 | dev->name, dev->dev_addr); |
548 | 546 | ||
549 | dev->open = &elmc_open; | 547 | dev->open = &elmc_open; |
550 | dev->stop = &elmc_close; | 548 | dev->stop = &elmc_close; |