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/mace.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/mace.c')
-rw-r--r-- | drivers/net/mace.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index ee132b1e09b0..95ebe72f320f 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c | |||
@@ -101,6 +101,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i | |||
101 | struct mace_data *mp; | 101 | struct mace_data *mp; |
102 | const unsigned char *addr; | 102 | const unsigned char *addr; |
103 | int j, rev, rc = -EBUSY; | 103 | int j, rev, rc = -EBUSY; |
104 | DECLARE_MAC_BUF(mac); | ||
104 | 105 | ||
105 | if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) { | 106 | if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) { |
106 | printk(KERN_ERR "can't use MACE %s: need 3 addrs and 3 irqs\n", | 107 | printk(KERN_ERR "can't use MACE %s: need 3 addrs and 3 irqs\n", |
@@ -240,11 +241,9 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i | |||
240 | goto err_free_rx_irq; | 241 | goto err_free_rx_irq; |
241 | } | 242 | } |
242 | 243 | ||
243 | printk(KERN_INFO "%s: MACE at", dev->name); | 244 | printk(KERN_INFO "%s: MACE at %s, chip revision %d.%d\n", |
244 | for (j = 0; j < 6; ++j) { | 245 | dev->name, print_mac(mac, dev->dev_addr), |
245 | printk("%c%.2x", (j? ':': ' '), dev->dev_addr[j]); | 246 | mp->chipid >> 8, mp->chipid & 0xff); |
246 | } | ||
247 | printk(", chip revision %d.%d\n", mp->chipid >> 8, mp->chipid & 0xff); | ||
248 | 247 | ||
249 | return 0; | 248 | return 0; |
250 | 249 | ||