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/wl3501_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/wl3501_cs.c')
-rw-r--r-- | drivers/net/wireless/wl3501_cs.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index 68789c6e1ce..8b96f50d9c6 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c | |||
@@ -860,10 +860,9 @@ static int wl3501_esbq_confirm(struct wl3501_card *this) | |||
860 | static void wl3501_online(struct net_device *dev) | 860 | static void wl3501_online(struct net_device *dev) |
861 | { | 861 | { |
862 | struct wl3501_card *this = netdev_priv(dev); | 862 | struct wl3501_card *this = netdev_priv(dev); |
863 | DECLARE_MAC_BUF(mac); | ||
864 | 863 | ||
865 | printk(KERN_INFO "%s: Wireless LAN online. BSSID: %s\n", | 864 | printk(KERN_INFO "%s: Wireless LAN online. BSSID: %pM\n", |
866 | dev->name, print_mac(mac, this->bssid)); | 865 | dev->name, this->bssid); |
867 | netif_wake_queue(dev); | 866 | netif_wake_queue(dev); |
868 | } | 867 | } |
869 | 868 | ||
@@ -1965,7 +1964,6 @@ static int wl3501_config(struct pcmcia_device *link) | |||
1965 | struct net_device *dev = link->priv; | 1964 | struct net_device *dev = link->priv; |
1966 | int i = 0, j, last_fn, last_ret; | 1965 | int i = 0, j, last_fn, last_ret; |
1967 | struct wl3501_card *this; | 1966 | struct wl3501_card *this; |
1968 | DECLARE_MAC_BUF(mac); | ||
1969 | 1967 | ||
1970 | /* Try allocating IO ports. This tries a few fixed addresses. If you | 1968 | /* Try allocating IO ports. This tries a few fixed addresses. If you |
1971 | * want, you can also read the card's config table to pick addresses -- | 1969 | * want, you can also read the card's config table to pick addresses -- |
@@ -2024,9 +2022,9 @@ static int wl3501_config(struct pcmcia_device *link) | |||
2024 | 2022 | ||
2025 | /* print probe information */ | 2023 | /* print probe information */ |
2026 | printk(KERN_INFO "%s: wl3501 @ 0x%3.3x, IRQ %d, " | 2024 | printk(KERN_INFO "%s: wl3501 @ 0x%3.3x, IRQ %d, " |
2027 | "MAC addr in flash ROM:%s\n", | 2025 | "MAC addr in flash ROM:%pM\n", |
2028 | dev->name, this->base_addr, (int)dev->irq, | 2026 | dev->name, this->base_addr, (int)dev->irq, |
2029 | print_mac(mac, dev->dev_addr)); | 2027 | dev->dev_addr); |
2030 | /* | 2028 | /* |
2031 | * Initialize card parameters - added by jss | 2029 | * Initialize card parameters - added by jss |
2032 | */ | 2030 | */ |