aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/p54')
-rw-r--r--drivers/net/wireless/p54/p54common.c5
-rw-r--r--drivers/net/wireless/p54/p54pci.c1
-rw-r--r--drivers/net/wireless/p54/p54usb.c1
3 files changed, 2 insertions, 5 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;
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 1c2a02a741af..194237b66424 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -481,7 +481,6 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
481 struct ieee80211_hw *dev; 481 struct ieee80211_hw *dev;
482 unsigned long mem_addr, mem_len; 482 unsigned long mem_addr, mem_len;
483 int err; 483 int err;
484 DECLARE_MAC_BUF(mac);
485 484
486 err = pci_enable_device(pdev); 485 err = pci_enable_device(pdev);
487 if (err) { 486 if (err) {
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index 75d749bccb0d..68f1b80f04d9 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -786,7 +786,6 @@ static int __devinit p54u_probe(struct usb_interface *intf,
786 struct p54u_priv *priv; 786 struct p54u_priv *priv;
787 int err; 787 int err;
788 unsigned int i, recognized_pipes; 788 unsigned int i, recognized_pipes;
789 DECLARE_MAC_BUF(mac);
790 789
791 dev = p54_init_common(sizeof(*priv)); 790 dev = p54_init_common(sizeof(*priv));
792 if (!dev) { 791 if (!dev) {