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/wireless/netwave_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/wireless/netwave_cs.c')
-rw-r--r-- | drivers/net/wireless/netwave_cs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index a670f36b5f3f..be80c0093b79 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c | |||
@@ -737,7 +737,6 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) { | |||
737 | win_req_t req; | 737 | win_req_t req; |
738 | memreq_t mem; | 738 | memreq_t mem; |
739 | u_char __iomem *ramBase = NULL; | 739 | u_char __iomem *ramBase = NULL; |
740 | DECLARE_MAC_BUF(mac); | ||
741 | 740 | ||
742 | DEBUG(0, "netwave_pcmcia_config(0x%p)\n", link); | 741 | DEBUG(0, "netwave_pcmcia_config(0x%p)\n", link); |
743 | 742 | ||
@@ -808,12 +807,12 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) { | |||
808 | dev->dev_addr[i] = readb(ramBase + NETWAVE_EREG_PA + i); | 807 | dev->dev_addr[i] = readb(ramBase + NETWAVE_EREG_PA + i); |
809 | 808 | ||
810 | printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx, " | 809 | printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx, " |
811 | "id %c%c, hw_addr %s\n", | 810 | "id %c%c, hw_addr %pM\n", |
812 | dev->name, dev->base_addr, dev->irq, | 811 | dev->name, dev->base_addr, dev->irq, |
813 | (u_long) ramBase, | 812 | (u_long) ramBase, |
814 | (int) readb(ramBase+NETWAVE_EREG_NI), | 813 | (int) readb(ramBase+NETWAVE_EREG_NI), |
815 | (int) readb(ramBase+NETWAVE_EREG_NI+1), | 814 | (int) readb(ramBase+NETWAVE_EREG_NI+1), |
816 | print_mac(mac, dev->dev_addr)); | 815 | dev->dev_addr); |
817 | 816 | ||
818 | /* get revision words */ | 817 | /* get revision words */ |
819 | printk(KERN_DEBUG "Netwave_reset: revision %04x %04x\n", | 818 | printk(KERN_DEBUG "Netwave_reset: revision %04x %04x\n", |