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/axnet_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/axnet_cs.c')
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index b37a498939ae..889f1bdb0853 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -321,7 +321,6 @@ static int axnet_config(struct pcmcia_device *link) | |||
321 | struct net_device *dev = link->priv; | 321 | struct net_device *dev = link->priv; |
322 | axnet_dev_t *info = PRIV(dev); | 322 | axnet_dev_t *info = PRIV(dev); |
323 | int i, j, last_ret, last_fn; | 323 | int i, j, last_ret, last_fn; |
324 | DECLARE_MAC_BUF(mac); | ||
325 | 324 | ||
326 | DEBUG(0, "axnet_config(0x%p)\n", link); | 325 | DEBUG(0, "axnet_config(0x%p)\n", link); |
327 | 326 | ||
@@ -397,10 +396,10 @@ static int axnet_config(struct pcmcia_device *link) | |||
397 | strcpy(info->node.dev_name, dev->name); | 396 | strcpy(info->node.dev_name, dev->name); |
398 | 397 | ||
399 | printk(KERN_INFO "%s: Asix AX88%d90: io %#3lx, irq %d, " | 398 | printk(KERN_INFO "%s: Asix AX88%d90: io %#3lx, irq %d, " |
400 | "hw_addr %s\n", | 399 | "hw_addr %pM\n", |
401 | dev->name, ((info->flags & IS_AX88790) ? 7 : 1), | 400 | dev->name, ((info->flags & IS_AX88790) ? 7 : 1), |
402 | dev->base_addr, dev->irq, | 401 | dev->base_addr, dev->irq, |
403 | print_mac(mac, dev->dev_addr)); | 402 | dev->dev_addr); |
404 | if (info->phy_id != -1) { | 403 | if (info->phy_id != -1) { |
405 | DEBUG(0, " MII transceiver at index %d, status %x.\n", info->phy_id, j); | 404 | DEBUG(0, " MII transceiver at index %d, status %x.\n", info->phy_id, j); |
406 | } else { | 405 | } else { |