diff options
author | Joe Perches <joe@perches.com> | 2007-10-03 20:59:30 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:42 -0400 |
commit | 0795af5729b18218767fab27c44b1384f72dc9ad (patch) | |
tree | 67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/macsonic.c | |
parent | 95ea36275f3c9a1d3d04c217b4b576c657c4e70e (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/macsonic.c')
-rw-r--r-- | drivers/net/macsonic.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c index a55a8399344c..b267161418ea 100644 --- a/drivers/net/macsonic.c +++ b/drivers/net/macsonic.c | |||
@@ -223,6 +223,7 @@ int __init mac_onboard_sonic_ethernet_addr(struct net_device* dev) | |||
223 | struct sonic_local *lp = netdev_priv(dev); | 223 | struct sonic_local *lp = netdev_priv(dev); |
224 | const int prom_addr = ONBOARD_SONIC_PROM_BASE; | 224 | const int prom_addr = ONBOARD_SONIC_PROM_BASE; |
225 | int i; | 225 | int i; |
226 | DECLARE_MAC_BUF(mac); | ||
226 | 227 | ||
227 | /* On NuBus boards we can sometimes look in the ROM resources. | 228 | /* On NuBus boards we can sometimes look in the ROM resources. |
228 | No such luck for comm-slot/onboard. */ | 229 | No such luck for comm-slot/onboard. */ |
@@ -266,13 +267,8 @@ int __init mac_onboard_sonic_ethernet_addr(struct net_device* dev) | |||
266 | dev->dev_addr[1] = val >> 8; | 267 | dev->dev_addr[1] = val >> 8; |
267 | dev->dev_addr[0] = val & 0xff; | 268 | dev->dev_addr[0] = val & 0xff; |
268 | 269 | ||
269 | printk(KERN_INFO "HW Address from CAM 15: "); | 270 | printk(KERN_INFO "HW Address from CAM 15: %s\n", |
270 | for (i = 0; i < 6; i++) { | 271 | print_mac(mac, dev->dev_addr)); |
271 | printk("%2.2x", dev->dev_addr[i]); | ||
272 | if (i < 5) | ||
273 | printk(":"); | ||
274 | } | ||
275 | printk("\n"); | ||
276 | } else return 0; | 272 | } else return 0; |
277 | 273 | ||
278 | if (memcmp(dev->dev_addr, "\x08\x00\x07", 3) && | 274 | if (memcmp(dev->dev_addr, "\x08\x00\x07", 3) && |
@@ -567,7 +563,7 @@ static int __init mac_sonic_probe(struct platform_device *pdev) | |||
567 | struct net_device *dev; | 563 | struct net_device *dev; |
568 | struct sonic_local *lp; | 564 | struct sonic_local *lp; |
569 | int err; | 565 | int err; |
570 | int i; | 566 | DECLARE_MAC_BUF(mac); |
571 | 567 | ||
572 | dev = alloc_etherdev(sizeof(struct sonic_local)); | 568 | dev = alloc_etherdev(sizeof(struct sonic_local)); |
573 | if (!dev) | 569 | if (!dev) |
@@ -591,13 +587,8 @@ found: | |||
591 | if (err) | 587 | if (err) |
592 | goto out; | 588 | goto out; |
593 | 589 | ||
594 | printk("%s: MAC ", dev->name); | 590 | printk("%s: MAC %s IRQ %d\n", |
595 | for (i = 0; i < 6; i++) { | 591 | dev->name, print_mac(mac, dev->dev_addr), dev->irq); |
596 | printk("%2.2x", dev->dev_addr[i]); | ||
597 | if (i < 5) | ||
598 | printk(":"); | ||
599 | } | ||
600 | printk(" IRQ %d\n", dev->irq); | ||
601 | 592 | ||
602 | return 0; | 593 | return 0; |
603 | 594 | ||