aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c523.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2007-10-03 20:59:30 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:51:42 -0400
commit0795af5729b18218767fab27c44b1384f72dc9ad (patch)
tree67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/3c523.c
parent95ea36275f3c9a1d3d04c217b4b576c657c4e70e (diff)
[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()
This is nicer than the MAC_FMT stuff. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/3c523.c')
-rw-r--r--drivers/net/3c523.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index 10852b2a40ab..239fc42fb8df 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -383,8 +383,8 @@ void alloc586(struct net_device *dev)
383static int elmc_getinfo(char *buf, int slot, void *d) 383static int elmc_getinfo(char *buf, int slot, void *d)
384{ 384{
385 int len = 0; 385 int len = 0;
386 struct net_device *dev = (struct net_device *) d; 386 struct net_device *dev = d;
387 int i; 387 DECLARE_MAC_BUF(mac);
388 388
389 if (dev == NULL) 389 if (dev == NULL)
390 return len; 390 return len;
@@ -399,12 +399,8 @@ static int elmc_getinfo(char *buf, int slot, void *d)
399 len += sprintf(buf + len, "Transceiver: %s\n", dev->if_port ? 399 len += sprintf(buf + len, "Transceiver: %s\n", dev->if_port ?
400 "External" : "Internal"); 400 "External" : "Internal");
401 len += sprintf(buf + len, "Device: %s\n", dev->name); 401 len += sprintf(buf + len, "Device: %s\n", dev->name);
402 len += sprintf(buf + len, "Hardware Address:"); 402 len += sprintf(buf + len, "Hardware Address: %s\n",
403 for (i = 0; i < 6; i++) { 403 print_mac(mac, dev->dev_addr));
404 len += sprintf(buf + len, " %02x", dev->dev_addr[i]);
405 }
406 buf[len++] = '\n';
407 buf[len] = 0;
408 404
409 return len; 405 return len;
410} /* elmc_getinfo() */ 406} /* elmc_getinfo() */
@@ -422,6 +418,7 @@ static int __init do_elmc_probe(struct net_device *dev)
422 unsigned int size = 0; 418 unsigned int size = 0;
423 int retval; 419 int retval;
424 struct priv *pr = dev->priv; 420 struct priv *pr = dev->priv;
421 DECLARE_MAC_BUF(mac);
425 422
426 if (MCA_bus == 0) { 423 if (MCA_bus == 0) {
427 return -ENODEV; 424 return -ENODEV;
@@ -544,12 +541,11 @@ static int __init do_elmc_probe(struct net_device *dev)
544 541
545 /* The hardware address for the 3c523 is stored in the first six 542 /* The hardware address for the 3c523 is stored in the first six
546 bytes of the IO address. */ 543 bytes of the IO address. */
547 printk(KERN_INFO "%s: hardware address ", dev->name); 544 for (i = 0; i < 6; i++)
548 for (i = 0; i < 6; i++) {
549 dev->dev_addr[i] = inb(dev->base_addr + i); 545 dev->dev_addr[i] = inb(dev->base_addr + i);
550 printk(" %02x", dev->dev_addr[i]); 546
551 } 547 printk(KERN_INFO "%s: hardware address %s\n",
552 printk("\n"); 548 dev->name, print_mac(mac, dev->dev_addr));
553 549
554 dev->open = &elmc_open; 550 dev->open = &elmc_open;
555 dev->stop = &elmc_close; 551 dev->stop = &elmc_close;