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/3c589_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/3c589_cs.c')
-rw-r--r-- | drivers/net/pcmcia/3c589_cs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index c235cdba69c6..5882109be777 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c | |||
@@ -255,7 +255,6 @@ static int tc589_config(struct pcmcia_device *link) | |||
255 | int last_fn, last_ret, i, j, multi = 0, fifo; | 255 | int last_fn, last_ret, i, j, multi = 0, fifo; |
256 | unsigned int ioaddr; | 256 | unsigned int ioaddr; |
257 | char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"}; | 257 | char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"}; |
258 | DECLARE_MAC_BUF(mac); | ||
259 | 258 | ||
260 | DEBUG(0, "3c589_config(0x%p)\n", link); | 259 | DEBUG(0, "3c589_config(0x%p)\n", link); |
261 | 260 | ||
@@ -333,9 +332,9 @@ static int tc589_config(struct pcmcia_device *link) | |||
333 | strcpy(lp->node.dev_name, dev->name); | 332 | strcpy(lp->node.dev_name, dev->name); |
334 | 333 | ||
335 | printk(KERN_INFO "%s: 3Com 3c%s, io %#3lx, irq %d, " | 334 | printk(KERN_INFO "%s: 3Com 3c%s, io %#3lx, irq %d, " |
336 | "hw_addr %s\n", | 335 | "hw_addr %pM\n", |
337 | dev->name, (multi ? "562" : "589"), dev->base_addr, dev->irq, | 336 | dev->name, (multi ? "562" : "589"), dev->base_addr, dev->irq, |
338 | print_mac(mac, dev->dev_addr)); | 337 | dev->dev_addr); |
339 | printk(KERN_INFO " %dK FIFO split %s Rx:Tx, %s xcvr\n", | 338 | printk(KERN_INFO " %dK FIFO split %s Rx:Tx, %s xcvr\n", |
340 | (fifo & 7) ? 32 : 8, ram_split[(fifo >> 16) & 3], | 339 | (fifo & 7) ? 32 : 8, ram_split[(fifo >> 16) & 3], |
341 | if_names[dev->if_port]); | 340 | if_names[dev->if_port]); |