Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...

[pandora-kernel.git] / drivers / net / wireless / rtlwifi / rtl8192se / hw.c

diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index b1d0213..d59f66c 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
@@ -27,6 +27,8 @@
  *
  *****************************************************************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "../wifi.h"
 #include "../efuse.h"
 #include "../base.h"
@@ -465,8 +467,7 @@ static u8 _rtl92ce_halset_sysclk(struct ieee80211_hw *hw, u8 data)
                        if ((tmpvalue & BIT(6)))
                                break;
 
-                       printk(KERN_ERR "wait for BIT(6) return value %x\n",
-                              tmpvalue);
+                       pr_err("wait for BIT(6) return value %x\n", tmpvalue);
                        if (waitcount == 0)
                                break;
 
@@ -1255,8 +1256,7 @@ static u8 _rtl92s_set_sysclk(struct ieee80211_hw *hw, u8 data)
                        if ((tmp & BIT(6)))
                                break;
 
-                       printk(KERN_ERR "wait for BIT(6) return value %x\n",
-                              tmp);
+                       pr_err("wait for BIT(6) return value %x\n", tmp);
 
                        if (waitcnt == 0)
                                break;
@@ -1315,7 +1315,7 @@ static void _rtl92s_phy_set_rfhalt(struct ieee80211_hw *hw)
        if (u1btmp & BIT(7)) {
                u1btmp &= ~(BIT(6) | BIT(7));
                if (!_rtl92s_set_sysclk(hw, u1btmp)) {
-                       printk(KERN_ERR "Switch ctrl path fail\n");
+                       pr_err("Switch ctrl path fail\n");
                        return;
                }
        }
@@ -1682,7 +1682,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                rtl_write_byte(rtlpriv, MACIDR0 + i, rtlefuse->dev_addr[i]);
 
        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                (MAC_FMT "\n", MAC_ARG(rtlefuse->dev_addr)));
+                ("%pM\n", rtlefuse->dev_addr));
 
        /* Get Tx Power Level by Channel */
        /* Read Tx power of Channel 1 ~ 14 from EEPROM. */