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/fmvj18x_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/fmvj18x_cs.c')
-rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 69d916daa7bb..465e4ad363ce 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
@@ -348,7 +348,6 @@ static int fmvj18x_config(struct pcmcia_device *link) | |||
348 | cardtype_t cardtype; | 348 | cardtype_t cardtype; |
349 | char *card_name = "unknown"; | 349 | char *card_name = "unknown"; |
350 | u_char *node_id; | 350 | u_char *node_id; |
351 | DECLARE_MAC_BUF(mac); | ||
352 | 351 | ||
353 | DEBUG(0, "fmvj18x_config(0x%p)\n", link); | 352 | DEBUG(0, "fmvj18x_config(0x%p)\n", link); |
354 | 353 | ||
@@ -539,9 +538,9 @@ static int fmvj18x_config(struct pcmcia_device *link) | |||
539 | 538 | ||
540 | /* print current configuration */ | 539 | /* print current configuration */ |
541 | printk(KERN_INFO "%s: %s, sram %s, port %#3lx, irq %d, " | 540 | printk(KERN_INFO "%s: %s, sram %s, port %#3lx, irq %d, " |
542 | "hw_addr %s\n", | 541 | "hw_addr %pM\n", |
543 | dev->name, card_name, sram_config == 0 ? "4K TX*2" : "8K TX*2", | 542 | dev->name, card_name, sram_config == 0 ? "4K TX*2" : "8K TX*2", |
544 | dev->base_addr, dev->irq, print_mac(mac, dev->dev_addr)); | 543 | dev->base_addr, dev->irq, dev->dev_addr); |
545 | 544 | ||
546 | return 0; | 545 | return 0; |
547 | 546 | ||