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/pcmcia/3c574_cs.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/pcmcia/3c574_cs.c')
-rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index 08c4dd896077..dcbb11ab98db 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -345,7 +345,6 @@ static int tc574_config(struct pcmcia_device *link) | |||
345 | __be16 *phys_addr; | 345 | __be16 *phys_addr; |
346 | char *cardname; | 346 | char *cardname; |
347 | __u32 config; | 347 | __u32 config; |
348 | DECLARE_MAC_BUF(mac); | ||
349 | 348 | ||
350 | phys_addr = (__be16 *)dev->dev_addr; | 349 | phys_addr = (__be16 *)dev->dev_addr; |
351 | 350 | ||
@@ -463,9 +462,9 @@ static int tc574_config(struct pcmcia_device *link) | |||
463 | strcpy(lp->node.dev_name, dev->name); | 462 | strcpy(lp->node.dev_name, dev->name); |
464 | 463 | ||
465 | printk(KERN_INFO "%s: %s at io %#3lx, irq %d, " | 464 | printk(KERN_INFO "%s: %s at io %#3lx, irq %d, " |
466 | "hw_addr %s.\n", | 465 | "hw_addr %pM.\n", |
467 | dev->name, cardname, dev->base_addr, dev->irq, | 466 | dev->name, cardname, dev->base_addr, dev->irq, |
468 | print_mac(mac, dev->dev_addr)); | 467 | dev->dev_addr); |
469 | printk(" %dK FIFO split %s Rx:Tx, %sMII interface.\n", | 468 | printk(" %dK FIFO split %s Rx:Tx, %sMII interface.\n", |
470 | 8 << config & Ram_size, | 469 | 8 << config & Ram_size, |
471 | ram_split[(config & Ram_split) >> Ram_split_shift], | 470 | ram_split[(config & Ram_split) >> Ram_split_shift], |