diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 15:59:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-27 17:06:18 -0700 |
| commit | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch) | |
| tree | e8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/bmac.c | |
| parent | 0c68ae2605dbcf67414d8d1f19af93be44b355fb (diff) | |
| download | kernel_samsung_espresso10-e174961ca1a0b28f7abf0be47973ad57cb74e5f0.zip kernel_samsung_espresso10-e174961ca1a0b28f7abf0be47973ad57cb74e5f0.tar.gz kernel_samsung_espresso10-e174961ca1a0b28f7abf0be47973ad57cb74e5f0.tar.bz2 | |
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/bmac.c')
| -rw-r--r-- | drivers/net/bmac.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c index a42bd19..b141d02 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c @@ -1258,7 +1258,6 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i unsigned char addr[6]; struct net_device *dev; int is_bmac_plus = ((int)match->data) != 0; - DECLARE_MAC_BUF(mac); if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) { printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n"); @@ -1368,8 +1367,8 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i goto err_out_irq2; } - printk(KERN_INFO "%s: BMAC%s at %s", - dev->name, (is_bmac_plus ? "+" : ""), print_mac(mac, dev->dev_addr)); + printk(KERN_INFO "%s: BMAC%s at %pM", + dev->name, (is_bmac_plus ? "+" : ""), dev->dev_addr); XXDEBUG((", base_addr=%#0lx", dev->base_addr)); printk("\n"); |