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/macsonic.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/macsonic.c')
-rw-r--r-- | drivers/net/macsonic.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c index e64c2086d33c..205bb05c25d6 100644 --- a/drivers/net/macsonic.c +++ b/drivers/net/macsonic.c | |||
@@ -220,7 +220,6 @@ static int __init mac_onboard_sonic_ethernet_addr(struct net_device *dev) | |||
220 | struct sonic_local *lp = netdev_priv(dev); | 220 | struct sonic_local *lp = netdev_priv(dev); |
221 | const int prom_addr = ONBOARD_SONIC_PROM_BASE; | 221 | const int prom_addr = ONBOARD_SONIC_PROM_BASE; |
222 | int i; | 222 | int i; |
223 | DECLARE_MAC_BUF(mac); | ||
224 | 223 | ||
225 | /* On NuBus boards we can sometimes look in the ROM resources. | 224 | /* On NuBus boards we can sometimes look in the ROM resources. |
226 | No such luck for comm-slot/onboard. */ | 225 | No such luck for comm-slot/onboard. */ |
@@ -264,8 +263,8 @@ static int __init mac_onboard_sonic_ethernet_addr(struct net_device *dev) | |||
264 | dev->dev_addr[1] = val >> 8; | 263 | dev->dev_addr[1] = val >> 8; |
265 | dev->dev_addr[0] = val & 0xff; | 264 | dev->dev_addr[0] = val & 0xff; |
266 | 265 | ||
267 | printk(KERN_INFO "HW Address from CAM 15: %s\n", | 266 | printk(KERN_INFO "HW Address from CAM 15: %pM\n", |
268 | print_mac(mac, dev->dev_addr)); | 267 | dev->dev_addr); |
269 | } else return 0; | 268 | } else return 0; |
270 | 269 | ||
271 | if (memcmp(dev->dev_addr, "\x08\x00\x07", 3) && | 270 | if (memcmp(dev->dev_addr, "\x08\x00\x07", 3) && |
@@ -560,7 +559,6 @@ static int __init mac_sonic_probe(struct platform_device *pdev) | |||
560 | struct net_device *dev; | 559 | struct net_device *dev; |
561 | struct sonic_local *lp; | 560 | struct sonic_local *lp; |
562 | int err; | 561 | int err; |
563 | DECLARE_MAC_BUF(mac); | ||
564 | 562 | ||
565 | dev = alloc_etherdev(sizeof(struct sonic_local)); | 563 | dev = alloc_etherdev(sizeof(struct sonic_local)); |
566 | if (!dev) | 564 | if (!dev) |
@@ -584,8 +582,7 @@ found: | |||
584 | if (err) | 582 | if (err) |
585 | goto out; | 583 | goto out; |
586 | 584 | ||
587 | printk("%s: MAC %s IRQ %d\n", | 585 | printk("%s: MAC %pM IRQ %d\n", dev->name, dev->dev_addr, dev->irq); |
588 | dev->name, print_mac(mac, dev->dev_addr), dev->irq); | ||
589 | 586 | ||
590 | return 0; | 587 | return 0; |
591 | 588 | ||