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/rtl8187_dev.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/rtl8187_dev.c')
-rw-r--r-- | drivers/net/wireless/rtl8187_dev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c index 431e3c78bf27..9ceae9017f86 100644 --- a/drivers/net/wireless/rtl8187_dev.c +++ b/drivers/net/wireless/rtl8187_dev.c | |||
@@ -1026,7 +1026,6 @@ static int __devinit rtl8187_probe(struct usb_interface *intf, | |||
1026 | const char *chip_name; | 1026 | const char *chip_name; |
1027 | u16 txpwr, reg; | 1027 | u16 txpwr, reg; |
1028 | int err, i; | 1028 | int err, i; |
1029 | DECLARE_MAC_BUF(mac); | ||
1030 | 1029 | ||
1031 | dev = ieee80211_alloc_hw(sizeof(*priv), &rtl8187_ops); | 1030 | dev = ieee80211_alloc_hw(sizeof(*priv), &rtl8187_ops); |
1032 | if (!dev) { | 1031 | if (!dev) { |
@@ -1209,8 +1208,8 @@ static int __devinit rtl8187_probe(struct usb_interface *intf, | |||
1209 | } | 1208 | } |
1210 | mutex_init(&priv->conf_mutex); | 1209 | mutex_init(&priv->conf_mutex); |
1211 | 1210 | ||
1212 | printk(KERN_INFO "%s: hwaddr %s, %s V%d + %s\n", | 1211 | printk(KERN_INFO "%s: hwaddr %pM, %s V%d + %s\n", |
1213 | wiphy_name(dev->wiphy), print_mac(mac, dev->wiphy->perm_addr), | 1212 | wiphy_name(dev->wiphy), dev->wiphy->perm_addr, |
1214 | chip_name, priv->asic_rev, priv->rf->name); | 1213 | chip_name, priv->asic_rev, priv->rf->name); |
1215 | 1214 | ||
1216 | return 0; | 1215 | return 0; |