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/bmac.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/bmac.c')
-rw-r--r-- | drivers/net/bmac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c index 2761441f6644..a42bd19646d3 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c | |||
@@ -1258,6 +1258,7 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i | |||
1258 | unsigned char addr[6]; | 1258 | unsigned char addr[6]; |
1259 | struct net_device *dev; | 1259 | struct net_device *dev; |
1260 | int is_bmac_plus = ((int)match->data) != 0; | 1260 | int is_bmac_plus = ((int)match->data) != 0; |
1261 | DECLARE_MAC_BUF(mac); | ||
1261 | 1262 | ||
1262 | if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) { | 1263 | if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) { |
1263 | printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n"); | 1264 | printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n"); |
@@ -1367,9 +1368,8 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i | |||
1367 | goto err_out_irq2; | 1368 | goto err_out_irq2; |
1368 | } | 1369 | } |
1369 | 1370 | ||
1370 | printk(KERN_INFO "%s: BMAC%s at", dev->name, (is_bmac_plus? "+": "")); | 1371 | printk(KERN_INFO "%s: BMAC%s at %s", |
1371 | for (j = 0; j < 6; ++j) | 1372 | dev->name, (is_bmac_plus ? "+" : ""), print_mac(mac, dev->dev_addr)); |
1372 | printk("%c%.2x", (j? ':': ' '), dev->dev_addr[j]); | ||
1373 | XXDEBUG((", base_addr=%#0lx", dev->base_addr)); | 1373 | XXDEBUG((", base_addr=%#0lx", dev->base_addr)); |
1374 | printk("\n"); | 1374 | printk("\n"); |
1375 | 1375 | ||