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/mace.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/mace.c')
-rw-r--r-- | drivers/net/mace.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index 451acdca2a21..a2021c0103b3 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c | |||
@@ -101,7 +101,6 @@ 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); | ||
105 | 104 | ||
106 | if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) { | 105 | if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) { |
107 | printk(KERN_ERR "can't use MACE %s: need 3 addrs and 3 irqs\n", | 106 | printk(KERN_ERR "can't use MACE %s: need 3 addrs and 3 irqs\n", |
@@ -241,8 +240,8 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i | |||
241 | goto err_free_rx_irq; | 240 | goto err_free_rx_irq; |
242 | } | 241 | } |
243 | 242 | ||
244 | printk(KERN_INFO "%s: MACE at %s, chip revision %d.%d\n", | 243 | printk(KERN_INFO "%s: MACE at %pM, chip revision %d.%d\n", |
245 | dev->name, print_mac(mac, dev->dev_addr), | 244 | dev->name, dev->dev_addr, |
246 | mp->chipid >> 8, mp->chipid & 0xff); | 245 | mp->chipid >> 8, mp->chipid & 0xff); |
247 | 246 | ||
248 | return 0; | 247 | return 0; |