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/ne-h8300.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/ne-h8300.c')
-rw-r--r-- | drivers/net/ne-h8300.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ne-h8300.c b/drivers/net/ne-h8300.c index fbc7531d3c7d..aa99f5e09d37 100644 --- a/drivers/net/ne-h8300.c +++ b/drivers/net/ne-h8300.c | |||
@@ -204,7 +204,6 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr) | |||
204 | static unsigned version_printed; | 204 | static unsigned version_printed; |
205 | struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); | 205 | struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); |
206 | unsigned char bus_width; | 206 | unsigned char bus_width; |
207 | DECLARE_MAC_BUF(mac); | ||
208 | 207 | ||
209 | if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME)) | 208 | if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME)) |
210 | return -EBUSY; | 209 | return -EBUSY; |
@@ -299,7 +298,7 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr) | |||
299 | 298 | ||
300 | for(i = 0; i < ETHER_ADDR_LEN; i++) | 299 | for(i = 0; i < ETHER_ADDR_LEN; i++) |
301 | dev->dev_addr[i] = SA_prom[i]; | 300 | dev->dev_addr[i] = SA_prom[i]; |
302 | printk(" %s\n", print_mac(mac, dev->dev_addr)); | 301 | printk(" %pM\n", dev->dev_addr); |
303 | 302 | ||
304 | printk("%s: %s found at %#x, using IRQ %d.\n", | 303 | printk("%s: %s found at %#x, using IRQ %d.\n", |
305 | dev->name, name, ioaddr, dev->irq); | 304 | dev->name, name, ioaddr, dev->irq); |