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/pcnet_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/pcnet_cs.c')
-rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index e40d6301aa7a..69625373a8ed 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
@@ -554,7 +554,6 @@ static int pcnet_config(struct pcmcia_device *link) | |||
554 | int last_ret, last_fn, start_pg, stop_pg, cm_offset; | 554 | int last_ret, last_fn, start_pg, stop_pg, cm_offset; |
555 | int has_shmem = 0; | 555 | int has_shmem = 0; |
556 | hw_info_t *local_hw_info; | 556 | hw_info_t *local_hw_info; |
557 | DECLARE_MAC_BUF(mac); | ||
558 | 557 | ||
559 | DEBUG(0, "pcnet_config(0x%p)\n", link); | 558 | DEBUG(0, "pcnet_config(0x%p)\n", link); |
560 | 559 | ||
@@ -675,7 +674,7 @@ static int pcnet_config(struct pcmcia_device *link) | |||
675 | printk (" mem %#5lx,", dev->mem_start); | 674 | printk (" mem %#5lx,", dev->mem_start); |
676 | if (info->flags & HAS_MISC_REG) | 675 | if (info->flags & HAS_MISC_REG) |
677 | printk(" %s xcvr,", if_names[dev->if_port]); | 676 | printk(" %s xcvr,", if_names[dev->if_port]); |
678 | printk(" hw_addr %s\n", print_mac(mac, dev->dev_addr)); | 677 | printk(" hw_addr %pM\n", dev->dev_addr); |
679 | return 0; | 678 | return 0; |
680 | 679 | ||
681 | cs_failed: | 680 | cs_failed: |