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/p54/p54common.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/p54/p54common.c')
-rw-r--r-- | drivers/net/wireless/p54/p54common.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c index 2d022f83774c..72859decd907 100644 --- a/drivers/net/wireless/p54/p54common.c +++ b/drivers/net/wireless/p54/p54common.c | |||
@@ -320,7 +320,6 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len) | |||
320 | int err; | 320 | int err; |
321 | u8 *end = (u8 *)eeprom + len; | 321 | u8 *end = (u8 *)eeprom + len; |
322 | u16 synth; | 322 | u16 synth; |
323 | DECLARE_MAC_BUF(mac); | ||
324 | 323 | ||
325 | wrap = (struct eeprom_pda_wrap *) eeprom; | 324 | wrap = (struct eeprom_pda_wrap *) eeprom; |
326 | entry = (void *)wrap->data + le16_to_cpu(wrap->len); | 325 | entry = (void *)wrap->data + le16_to_cpu(wrap->len); |
@@ -445,9 +444,9 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len) | |||
445 | SET_IEEE80211_PERM_ADDR(dev, perm_addr); | 444 | SET_IEEE80211_PERM_ADDR(dev, perm_addr); |
446 | } | 445 | } |
447 | 446 | ||
448 | printk(KERN_INFO "%s: hwaddr %s, MAC:isl38%02x RF:%s\n", | 447 | printk(KERN_INFO "%s: hwaddr %pM, MAC:isl38%02x RF:%s\n", |
449 | wiphy_name(dev->wiphy), | 448 | wiphy_name(dev->wiphy), |
450 | print_mac(mac, dev->wiphy->perm_addr), | 449 | dev->wiphy->perm_addr, |
451 | priv->version, p54_rf_chips[priv->rxhw]); | 450 | priv->version, p54_rf_chips[priv->rxhw]); |
452 | 451 | ||
453 | return 0; | 452 | return 0; |