Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
index 891b8490e349..5738a55c1b06 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
@@ -573,7 +573,7 @@ static int rtl8187_cmd_reset(struct ieee80211_hw *dev)
         } while (--i);
 
         if (!i) {
-                printk(KERN_ERR "%s: Reset timeout!\n", wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "reset timeout!\n");
                 return -ETIMEDOUT;
         }
 
@@ -589,8 +589,7 @@ static int rtl8187_cmd_reset(struct ieee80211_hw *dev)
         } while (--i);
 
         if (!i) {
-                printk(KERN_ERR "%s: eeprom reset timeout!\n",
-                       wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "eeprom reset timeout!\n");
                 return -ETIMEDOUT;
         }
 
@@ -1527,9 +1526,9 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
         mutex_init(&priv->conf_mutex);
         skb_queue_head_init(&priv->b_tx_status.queue);
 
-        printk(KERN_INFO "%s: hwaddr %pM, %s V%d + %s, rfkill mask %d\n",
-               wiphy_name(dev->wiphy), mac_addr,
-               chip_name, priv->asic_rev, priv->rf->name, priv->rfkill_mask);
+        wiphy_info(dev->wiphy, "hwaddr %pm, %s v%d + %s, rfkill mask %d\n",
+                   mac_addr, chip_name, priv->asic_rev, priv->rf->name,
+                   priv->rfkill_mask);
 
 #ifdef CONFIG_RTL8187_LEDS
         eeprom_93cx6_read(&eeprom, 0x3F, &reg);