diff options
author | Joe Perches <joe@perches.com> | 2007-10-03 20:59:30 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:42 -0400 |
commit | 0795af5729b18218767fab27c44b1384f72dc9ad (patch) | |
tree | 67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/wireless/netwave_cs.c | |
parent | 95ea36275f3c9a1d3d04c217b4b576c657c4e70e (diff) |
[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()
This is nicer than the MAC_FMT stuff.
Signed-off-by: Joe Perches <joe@perches.com>
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 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index d8a59afa7178..c2d71afd57e5 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c | |||
@@ -737,6 +737,7 @@ 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); | ||
740 | 741 | ||
741 | DEBUG(0, "netwave_pcmcia_config(0x%p)\n", link); | 742 | DEBUG(0, "netwave_pcmcia_config(0x%p)\n", link); |
742 | 743 | ||
@@ -805,12 +806,13 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) { | |||
805 | for (i = 0; i < 6; i++) | 806 | for (i = 0; i < 6; i++) |
806 | dev->dev_addr[i] = readb(ramBase + NETWAVE_EREG_PA + i); | 807 | dev->dev_addr[i] = readb(ramBase + NETWAVE_EREG_PA + i); |
807 | 808 | ||
808 | printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx id " | 809 | printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx" |
809 | "%c%c, hw_addr ", dev->name, dev->base_addr, dev->irq, | 810 | "id %c%c, hw_addr %s\n", |
810 | (u_long) ramBase, (int) readb(ramBase+NETWAVE_EREG_NI), | 811 | dev->name, dev->base_addr, dev->irq, |
811 | (int) readb(ramBase+NETWAVE_EREG_NI+1)); | 812 | (u_long) ramBase, |
812 | for (i = 0; i < 6; i++) | 813 | (int) readb(ramBase+NETWAVE_EREG_NI), |
813 | printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n")); | 814 | (int) readb(ramBase+NETWAVE_EREG_NI+1), |
815 | print_mac(mac, dev->dev_addr)); | ||
814 | 816 | ||
815 | /* get revision words */ | 817 | /* get revision words */ |
816 | printk(KERN_DEBUG "Netwave_reset: revision %04x %04x\n", | 818 | printk(KERN_DEBUG "Netwave_reset: revision %04x %04x\n", |