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/xtsonic.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/xtsonic.c')
-rw-r--r-- | drivers/net/xtsonic.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/xtsonic.c b/drivers/net/xtsonic.c index da42aa06a3ba..03a3f34e9039 100644 --- a/drivers/net/xtsonic.c +++ b/drivers/net/xtsonic.c | |||
@@ -239,8 +239,6 @@ int __init xtsonic_probe(struct platform_device *pdev) | |||
239 | struct resource *resmem, *resirq; | 239 | struct resource *resmem, *resirq; |
240 | int err = 0; | 240 | int err = 0; |
241 | 241 | ||
242 | DECLARE_MAC_BUF(mac); | ||
243 | |||
244 | if ((resmem = platform_get_resource(pdev, IORESOURCE_MEM, 0)) == NULL) | 242 | if ((resmem = platform_get_resource(pdev, IORESOURCE_MEM, 0)) == NULL) |
245 | return -ENODEV; | 243 | return -ENODEV; |
246 | 244 | ||
@@ -263,8 +261,8 @@ int __init xtsonic_probe(struct platform_device *pdev) | |||
263 | if ((err = register_netdev(dev))) | 261 | if ((err = register_netdev(dev))) |
264 | goto out1; | 262 | goto out1; |
265 | 263 | ||
266 | printk("%s: SONIC ethernet @%08lx, MAC %s, IRQ %d\n", dev->name, | 264 | printk("%s: SONIC ethernet @%08lx, MAC %pM, IRQ %d\n", dev->name, |
267 | dev->base_addr, print_mac(mac, dev->dev_addr), dev->irq); | 265 | dev->base_addr, dev->dev_addr, dev->irq); |
268 | 266 | ||
269 | return 0; | 267 | return 0; |
270 | 268 | ||