rtlwifi: Use ffs in <foo>_phy_calculate_bit_shift
[linux-2.6-microblaze.git] / drivers / net / wireless / realtek / rtlwifi / rtl8188ee / phy.c
index d13983e..9be032e 100644 (file)
@@ -16,7 +16,12 @@ static u32 _rtl88e_phy_rf_serial_read(struct ieee80211_hw *hw,
 static void _rtl88e_phy_rf_serial_write(struct ieee80211_hw *hw,
                                        enum radio_path rfpath, u32 offset,
                                        u32 data);
-static u32 _rtl88e_phy_calculate_bit_shift(u32 bitmask);
+static u32 _rtl88e_phy_calculate_bit_shift(u32 bitmask)
+{
+       u32 i = ffs(bitmask);
+
+       return i ? i - 1 : 32;
+}
 static bool _rtl88e_phy_bb8188e_config_parafile(struct ieee80211_hw *hw);
 static bool _rtl88e_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);
 static bool phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
@@ -43,15 +48,15 @@ u32 rtl88e_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 returnvalue, originalvalue, bitshift;
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "regaddr(%#x), bitmask(%#x)\n", regaddr, bitmask);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "regaddr(%#x), bitmask(%#x)\n", regaddr, bitmask);
        originalvalue = rtl_read_dword(rtlpriv, regaddr);
        bitshift = _rtl88e_phy_calculate_bit_shift(bitmask);
        returnvalue = (originalvalue & bitmask) >> bitshift;
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "BBR MASK=0x%x Addr[0x%x]=0x%x\n", bitmask,
-                regaddr, originalvalue);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "BBR MASK=0x%x Addr[0x%x]=0x%x\n", bitmask,
+               regaddr, originalvalue);
 
        return returnvalue;
 
@@ -63,9 +68,9 @@ void rtl88e_phy_set_bb_reg(struct ieee80211_hw *hw,
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 originalvalue, bitshift;
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "regaddr(%#x), bitmask(%#x), data(%#x)\n",
-                regaddr, bitmask, data);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+               regaddr, bitmask, data);
 
        if (bitmask != MASKDWORD) {
                originalvalue = rtl_read_dword(rtlpriv, regaddr);
@@ -75,9 +80,9 @@ void rtl88e_phy_set_bb_reg(struct ieee80211_hw *hw,
 
        rtl_write_dword(rtlpriv, regaddr, data);
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "regaddr(%#x), bitmask(%#x), data(%#x)\n",
-                regaddr, bitmask, data);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+               regaddr, bitmask, data);
 }
 
 u32 rtl88e_phy_query_rf_reg(struct ieee80211_hw *hw,
@@ -86,9 +91,9 @@ u32 rtl88e_phy_query_rf_reg(struct ieee80211_hw *hw,
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 original_value, readback_value, bitshift;
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
-                regaddr, rfpath, bitmask);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
+               regaddr, rfpath, bitmask);
 
        spin_lock(&rtlpriv->locks.rf_lock);
 
@@ -99,9 +104,9 @@ u32 rtl88e_phy_query_rf_reg(struct ieee80211_hw *hw,
 
        spin_unlock(&rtlpriv->locks.rf_lock);
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
-                 regaddr, rfpath, bitmask, original_value);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
+               regaddr, rfpath, bitmask, original_value);
        return readback_value;
 }
 
@@ -112,9 +117,9 @@ void rtl88e_phy_set_rf_reg(struct ieee80211_hw *hw,
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 original_value, bitshift;
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
-                 regaddr, bitmask, data, rfpath);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+               regaddr, bitmask, data, rfpath);
 
        spin_lock(&rtlpriv->locks.rf_lock);
 
@@ -133,9 +138,9 @@ void rtl88e_phy_set_rf_reg(struct ieee80211_hw *hw,
 
        spin_unlock(&rtlpriv->locks.rf_lock);
 
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
-                regaddr, bitmask, data, rfpath);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+               regaddr, bitmask, data, rfpath);
 }
 
 static u32 _rtl88e_phy_rf_serial_read(struct ieee80211_hw *hw,
@@ -179,9 +184,9 @@ static u32 _rtl88e_phy_rf_serial_read(struct ieee80211_hw *hw,
        else
                retvalue = rtl_get_bbreg(hw, pphyreg->rf_rb,
                                         BLSSIREADBACKDATA);
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "RFR-%d Addr[0x%x]=0x%x\n",
-                rfpath, pphyreg->rf_rb, retvalue);
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "RFR-%d Addr[0x%x]=0x%x\n",
+               rfpath, pphyreg->rf_rb, retvalue);
        return retvalue;
 }
 
@@ -203,20 +208,9 @@ static void _rtl88e_phy_rf_serial_write(struct ieee80211_hw *hw,
        newoffset = offset;
        data_and_addr = ((newoffset << 20) | (data & 0x000fffff)) & 0x0fffffff;
        rtl_set_bbreg(hw, pphyreg->rf3wire_offset, MASKDWORD, data_and_addr);
-       RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                "RFW-%d Addr[0x%x]=0x%x\n",
-                rfpath, pphyreg->rf3wire_offset, data_and_addr);
-}
-
-static u32 _rtl88e_phy_calculate_bit_shift(u32 bitmask)
-{
-       u32 i;
-
-       for (i = 0; i <= 31; i++) {
-               if (((bitmask >> i) & 0x1) == 1)
-                       break;
-       }
-       return i;
+       rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
+               "RFW-%d Addr[0x%x]=0x%x\n",
+               rfpath, pphyreg->rf3wire_offset, data_and_addr);
 }
 
 bool rtl88e_phy_mac_config(struct ieee80211_hw *hw)
@@ -381,11 +375,11 @@ static bool _rtl88e_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
        u32 arraylength;
        u32 *ptrarray;
 
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl8188EMACPHY_Array\n");
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl8188EMACPHY_Array\n");
        arraylength = RTL8188EEMAC_1T_ARRAYLEN;
        ptrarray = RTL8188EEMAC_1T_ARRAY;
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                "Img:RTL8188EEMAC_1T_ARRAY LEN %d\n", arraylength);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+               "Img:RTL8188EEMAC_1T_ARRAY LEN %d\n", arraylength);
        for (i = 0; i < arraylength; i = i + 2)
                rtl_write_byte(rtlpriv, ptrarray[i], (u8)ptrarray[i + 1]);
        return true;
@@ -487,9 +481,9 @@ static void handle_branch2(struct ieee80211_hw *hw, u16 arraylen,
                                        READ_NEXT_PAIR(v1, v2, i);
                        }
                }
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "The agctab_array_table[0] is %x Rtl818EEPHY_REGArray[1] is %x\n",
-                        array_table[i], array_table[i + 1]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "The agctab_array_table[0] is %x Rtl818EEPHY_REGArray[1] is %x\n",
+                       array_table[i], array_table[i + 1]);
        }
 }
 
@@ -521,52 +515,52 @@ static void store_pwrindex_rate_offset(struct ieee80211_hw *hw,
 
        if (regaddr == RTXAGC_A_RATE18_06) {
                rtlphy->mcs_txpwrlevel_origoffset[count][0] = data;
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][0] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][0]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][0] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][0]);
        }
        if (regaddr == RTXAGC_A_RATE54_24) {
                rtlphy->mcs_txpwrlevel_origoffset[count][1] = data;
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][1] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][1]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][1] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][1]);
        }
        if (regaddr == RTXAGC_A_CCK1_MCS32) {
                rtlphy->mcs_txpwrlevel_origoffset[count][6] = data;
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][6] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][6]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][6] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][6]);
        }
        if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0xffffff00) {
                rtlphy->mcs_txpwrlevel_origoffset[count][7] = data;
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][7] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][7]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][7] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][7]);
        }
        if (regaddr == RTXAGC_A_MCS03_MCS00) {
                rtlphy->mcs_txpwrlevel_origoffset[count][2] = data;
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][2] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][2]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][2] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][2]);
        }
        if (regaddr == RTXAGC_A_MCS07_MCS04) {
                rtlphy->mcs_txpwrlevel_origoffset[count][3] = data;
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][3] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][3]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][3] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][3]);
        }
        if (regaddr == RTXAGC_A_MCS11_MCS08) {
                rtlphy->mcs_txpwrlevel_origoffset[count][4] = data;
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][4] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][4]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][4] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][4]);
        }
        if (regaddr == RTXAGC_A_MCS15_MCS12) {
                rtlphy->mcs_txpwrlevel_origoffset[count][5] = data;
@@ -574,66 +568,66 @@ static void store_pwrindex_rate_offset(struct ieee80211_hw *hw,
                        count++;
                        rtlphy->pwrgroup_cnt = count;
                }
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][5] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][5]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][5] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][5]);
        }
        if (regaddr == RTXAGC_B_RATE18_06) {
                rtlphy->mcs_txpwrlevel_origoffset[count][8] = data;
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][8] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][8]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][8] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][8]);
        }
        if (regaddr == RTXAGC_B_RATE54_24) {
                rtlphy->mcs_txpwrlevel_origoffset[count][9] = data;
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][9] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][9]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][9] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][9]);
        }
        if (regaddr == RTXAGC_B_CCK1_55_MCS32) {
                rtlphy->mcs_txpwrlevel_origoffset[count][14] = data;
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][14] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][14]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][14] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][14]);
        }
        if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0x000000ff) {
                rtlphy->mcs_txpwrlevel_origoffset[count][15] = data;
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][15] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][15]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][15] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][15]);
        }
        if (regaddr == RTXAGC_B_MCS03_MCS00) {
                rtlphy->mcs_txpwrlevel_origoffset[count][10] = data;
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][10] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][10]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][10] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][10]);
        }
        if (regaddr == RTXAGC_B_MCS07_MCS04) {
                rtlphy->mcs_txpwrlevel_origoffset[count][11] = data;
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][11] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][11]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][11] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][11]);
        }
        if (regaddr == RTXAGC_B_MCS11_MCS08) {
                rtlphy->mcs_txpwrlevel_origoffset[count][12] = data;
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][12] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][12]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][12] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][12]);
        }
        if (regaddr == RTXAGC_B_MCS15_MCS12) {
                rtlphy->mcs_txpwrlevel_origoffset[count][13] = data;
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "MCSTxPowerLevelOriginalOffset[%d][13] = 0x%x\n",
-                         count,
-                         rtlphy->mcs_txpwrlevel_origoffset[count][13]);
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+                       "MCSTxPowerLevelOriginalOffset[%d][13] = 0x%x\n",
+                       count,
+                       rtlphy->mcs_txpwrlevel_origoffset[count][13]);
                if (get_rf_type(rtlphy) != RF_1T1R) {
                        count++;
                        rtlphy->pwrgroup_cnt = count;
@@ -696,8 +690,8 @@ static bool phy_config_bb_with_pghdr(struct ieee80211_hw *hw, u8 configtype)
                        }
                }
        } else {
-               RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                        "configtype != BaseBand_Config_PHY_REG\n");
+               rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
+                       "configtype != BaseBand_Config_PHY_REG\n");
        }
        return true;
 }
@@ -769,9 +763,9 @@ bool rtl88e_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
 
        radioa_arraylen = RTL8188EE_RADIOA_1TARRAYLEN;
        radioa_array_table = RTL8188EE_RADIOA_1TARRAY;
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                "Radio_A:RTL8188EE_RADIOA_1TARRAY %d\n", radioa_arraylen);
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+               "Radio_A:RTL8188EE_RADIOA_1TARRAY %d\n", radioa_arraylen);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
        switch (rfpath) {
        case RF90_PATH_A:
                process_path_a(hw, radioa_arraylen, radioa_array_table);
@@ -798,21 +792,21 @@ void rtl88e_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
        rtlphy->default_initialgain[3] =
            (u8)rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, MASKBYTE0);
 
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
-                rtlphy->default_initialgain[0],
-                rtlphy->default_initialgain[1],
-                rtlphy->default_initialgain[2],
-                rtlphy->default_initialgain[3]);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+               "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
+               rtlphy->default_initialgain[0],
+               rtlphy->default_initialgain[1],
+               rtlphy->default_initialgain[2],
+               rtlphy->default_initialgain[3]);
 
        rtlphy->framesync = (u8)rtl_get_bbreg(hw, ROFDM0_RXDETECTOR3,
                                              MASKBYTE0);
        rtlphy->framesync_c34 = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR2,
                                              MASKDWORD);
 
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                "Default framesync (0x%x) = 0x%x\n",
-                ROFDM0_RXDETECTOR3, rtlphy->framesync);
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
+               "Default framesync (0x%x) = 0x%x\n",
+               ROFDM0_RXDETECTOR3, rtlphy->framesync);
 }
 
 static void _rtl88e_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw)
@@ -1081,10 +1075,10 @@ void rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
        u8 reg_bw_opmode;
        u8 reg_prsr_rsc;
 
-       RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
-                "Switch to %s bandwidth\n",
-                 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
-                 "20MHz" : "40MHz");
+       rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE,
+               "Switch to %s bandwidth\n",
+               rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+               "20MHz" : "40MHz");
 
        if (is_hal_stop(rtlhal)) {
                rtlphy->set_bwmode_inprogress = false;
@@ -1138,7 +1132,7 @@ void rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
        }
        rtl88e_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
        rtlphy->set_bwmode_inprogress = false;
-       RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD, "\n");
+       rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD, "\n");
 }
 
 void rtl88e_phy_set_bw_mode(struct ieee80211_hw *hw,
@@ -1155,8 +1149,8 @@ void rtl88e_phy_set_bw_mode(struct ieee80211_hw *hw,
        if ((!is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw))) {
                rtl88e_phy_set_bw_mode_callback(hw);
        } else {
-               RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                        "false driver sleep or unload\n");
+               rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
+                       "false driver sleep or unload\n");
                rtlphy->set_bwmode_inprogress = false;
                rtlphy->current_chan_bw = tmp_bw;
        }
@@ -1169,8 +1163,8 @@ void rtl88e_phy_sw_chnl_callback(struct ieee80211_hw *hw)
        struct rtl_phy *rtlphy = &rtlpriv->phy;
        u32 delay;
 
-       RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
-                "switch to channel%d\n", rtlphy->current_channel);
+       rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE,
+               "switch to channel%d\n", rtlphy->current_channel);
        if (is_hal_stop(rtlhal))
                return;
        do {
@@ -1188,7 +1182,7 @@ void rtl88e_phy_sw_chnl_callback(struct ieee80211_hw *hw)
                }
                break;
        } while (true);
-       RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
+       rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
 }
 
 u8 rtl88e_phy_sw_chnl(struct ieee80211_hw *hw)
@@ -1208,13 +1202,13 @@ u8 rtl88e_phy_sw_chnl(struct ieee80211_hw *hw)
        rtlphy->sw_chnl_step = 0;
        if (!(is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw))) {
                rtl88e_phy_sw_chnl_callback(hw);
-               RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
-                        "sw_chnl_inprogress false schedule workitem current channel %d\n",
-                        rtlphy->current_channel);
+               rtl_dbg(rtlpriv, COMP_CHAN, DBG_LOUD,
+                       "sw_chnl_inprogress false schedule workitem current channel %d\n",
+                       rtlphy->current_channel);
                rtlphy->sw_chnl_inprogress = false;
        } else {
-               RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
-                        "sw_chnl_inprogress false driver sleep or unload\n");
+               rtl_dbg(rtlpriv, COMP_CHAN, DBG_LOUD,
+                       "sw_chnl_inprogress false driver sleep or unload\n");
                rtlphy->sw_chnl_inprogress = false;
        }
        return 1;
@@ -1315,9 +1309,9 @@ static bool _rtl88e_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
                        }
                        break;
                default:
-                       RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
-                                "switch case %#x not processed\n",
-                                currentcmd->cmdid);
+                       rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,
+                               "switch case %#x not processed\n",
+                               currentcmd->cmdid);
                        break;
                }
 
@@ -1581,7 +1575,7 @@ static void _rtl88e_phy_path_adda_on(struct ieee80211_hw *hw,
        u32 i;
 
        pathon = is_patha_on ? 0x04db25a4 : 0x0b1b25a4;
-       if (false == is2t) {
+       if (!is2t) {
                pathon = 0x0bdb25a0;
                rtl_set_bbreg(hw, addareg[0], MASKDWORD, 0x0b1b25a0);
        } else {
@@ -1749,8 +1743,8 @@ static void _rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw,
        for (i = 0; i < retrycount; i++) {
                patha_ok = _rtl88e_phy_path_a_iqk(hw, is2t);
                if (patha_ok == 0x01) {
-                       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                "Path A Tx IQK Success!!\n");
+                       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+                               "Path A Tx IQK Success!!\n");
                        result[t][0] = (rtl_get_bbreg(hw, 0xe94, MASKDWORD) &
                                        0x3FF0000) >> 16;
                        result[t][1] = (rtl_get_bbreg(hw, 0xe9c, MASKDWORD) &
@@ -1762,22 +1756,22 @@ static void _rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw,
        for (i = 0; i < retrycount; i++) {
                patha_ok = _rtl88e_phy_path_a_rx_iqk(hw, is2t);
                if (patha_ok == 0x03) {
-                       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                "Path A Rx IQK Success!!\n");
+                       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+                               "Path A Rx IQK Success!!\n");
                        result[t][2] = (rtl_get_bbreg(hw, 0xea4, MASKDWORD) &
                                        0x3FF0000) >> 16;
                        result[t][3] = (rtl_get_bbreg(hw, 0xeac, MASKDWORD) &
                                        0x3FF0000) >> 16;
                        break;
                } else {
-                       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                "Path a RX iqk fail!!!\n");
+                       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+                               "Path a RX iqk fail!!!\n");
                }
        }
 
        if (0 == patha_ok)
-               RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        "Path A IQK Success!!\n");
+               rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
+                       "Path A IQK Success!!\n");
        if (is2t) {
                _rtl88e_phy_path_a_standby(hw);
                _rtl88e_phy_path_adda_on(hw, adda_reg, false, is2t);
@@ -1828,7 +1822,7 @@ static void _rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw,
                rtl_set_bbreg(hw, 0xe30, MASKDWORD, 0x01008c00);
                rtl_set_bbreg(hw, 0xe34, MASKDWORD, 0x01008c00);
        }
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "88ee IQK Finish!!\n");
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "88ee IQK Finish!!\n");
 }
 
 static void _rtl88e_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
@@ -1874,7 +1868,7 @@ static void _rtl88e_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
        } else {
                rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
        }
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
 }
 
 static void _rtl88e_phy_set_rfpath_switch(struct ieee80211_hw *hw,
@@ -1883,7 +1877,7 @@ static void _rtl88e_phy_set_rfpath_switch(struct ieee80211_hw *hw,
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
+       rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
 
        if (is_hal_stop(rtlhal)) {
                u8 u1btmp;
@@ -2074,24 +2068,24 @@ bool rtl88e_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
        struct rtl_phy *rtlphy = &rtlpriv->phy;
        bool postprocessing = false;
 
-       RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
-                 iotype, rtlphy->set_io_inprogress);
+       rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
+               "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
+               iotype, rtlphy->set_io_inprogress);
        do {
                switch (iotype) {
                case IO_CMD_RESUME_DM_BY_SCAN:
-                       RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                                "[IO CMD] Resume DM after scan.\n");
+                       rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
+                               "[IO CMD] Resume DM after scan.\n");
                        postprocessing = true;
                        break;
                case IO_CMD_PAUSE_BAND0_DM_BY_SCAN:
-                       RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                                "[IO CMD] Pause DM before scan.\n");
+                       rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
+                               "[IO CMD] Pause DM before scan.\n");
                        postprocessing = true;
                        break;
                default:
-                       RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
-                                "switch case %#x not processed\n", iotype);
+                       rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,
+                               "switch case %#x not processed\n", iotype);
                        break;
                }
        } while (false);
@@ -2102,7 +2096,7 @@ bool rtl88e_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
                return false;
        }
        rtl88e_phy_set_io(hw);
-       RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "IO Type(%#x)\n", iotype);
+       rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE, "IO Type(%#x)\n", iotype);
        return true;
 }
 
@@ -2112,9 +2106,9 @@ static void rtl88e_phy_set_io(struct ieee80211_hw *hw)
        struct rtl_phy *rtlphy = &rtlpriv->phy;
        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
-       RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                "--->Cmd(%#x), set_io_inprogress(%d)\n",
-                 rtlphy->current_io_type, rtlphy->set_io_inprogress);
+       rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
+               "--->Cmd(%#x), set_io_inprogress(%d)\n",
+               rtlphy->current_io_type, rtlphy->set_io_inprogress);
        switch (rtlphy->current_io_type) {
        case IO_CMD_RESUME_DM_BY_SCAN:
                dm_digtable->cur_igvalue = rtlphy->initgain_backup.xaagccore1;
@@ -2128,14 +2122,14 @@ static void rtl88e_phy_set_io(struct ieee80211_hw *hw)
                rtl_set_bbreg(hw, RCCK0_CCA, 0xff0000, 0x40);
                break;
        default:
-               RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
-                        "switch case %#x not processed\n",
-                        rtlphy->current_io_type);
+               rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,
+                       "switch case %#x not processed\n",
+                       rtlphy->current_io_type);
                break;
        }
        rtlphy->set_io_inprogress = false;
-       RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                "(%#x)\n", rtlphy->current_io_type);
+       rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
+               "(%#x)\n", rtlphy->current_io_type);
 }
 
 static void rtl88ee_phy_set_rf_on(struct ieee80211_hw *hw)
@@ -2180,19 +2174,18 @@ static bool _rtl88ee_phy_set_rf_power_state(struct ieee80211_hw *hw,
 
                        do {
                                initializecount++;
-                               RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                        "IPS Set eRf nic enable\n");
+                               rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
+                                       "IPS Set eRf nic enable\n");
                                rtstatus = rtl_ps_enable_nic(hw);
                        } while (!rtstatus &&
                                 (initializecount < 10));
                        RT_CLEAR_PS_LEVEL(ppsc,
                                          RT_RF_OFF_LEVL_HALT_NIC);
                } else {
-                       RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                "Set ERFON sleeped:%d ms\n",
-                                 jiffies_to_msecs(jiffies -
-                                                  ppsc->
-                                                  last_sleep_jiffies));
+                       rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
+                               "Set ERFON slept:%d ms\n",
+                               jiffies_to_msecs(jiffies -
+                                                ppsc->last_sleep_jiffies));
                        ppsc->last_awake_jiffies = jiffies;
                        rtl88ee_phy_set_rf_on(hw);
                }
@@ -2213,27 +2206,27 @@ static bool _rtl88ee_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                queue_id++;
                                continue;
                        } else {
-                               RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                        "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
-                                        (i + 1), queue_id,
-                                        skb_queue_len(&ring->queue));
+                               rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
+                                       "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                       (i + 1), queue_id,
+                                       skb_queue_len(&ring->queue));
 
                                udelay(10);
                                i++;
                        }
                        if (i >= MAX_DOZE_WAITING_TIMES_9x) {
-                               RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                        "\n ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
-                                         MAX_DOZE_WAITING_TIMES_9x,
-                                         queue_id,
-                                         skb_queue_len(&ring->queue));
+                               rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
+                                       "\n ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
+                                       MAX_DOZE_WAITING_TIMES_9x,
+                                       queue_id,
+                                       skb_queue_len(&ring->queue));
                                break;
                        }
                }
 
                if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
-                       RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                "IPS Set eRf nic disable\n");
+                       rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
+                               "IPS Set eRf nic disable\n");
                        rtl_ps_disable_nic(hw);
                        RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
                } else {
@@ -2256,34 +2249,34 @@ static bool _rtl88ee_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                        queue_id++;
                                        continue;
                                } else {
-                                       RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
-                                                (i + 1), queue_id,
-                                                skb_queue_len(&ring->queue));
+                                       rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
+                                               "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                               (i + 1), queue_id,
+                                               skb_queue_len(&ring->queue));
 
                                        udelay(10);
                                        i++;
                                }
                                if (i >= MAX_DOZE_WAITING_TIMES_9x) {
-                                       RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                "\n ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
-                                                MAX_DOZE_WAITING_TIMES_9x,
-                                                queue_id,
-                                                skb_queue_len(&ring->queue));
+                                       rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
+                                               "\n ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
+                                               MAX_DOZE_WAITING_TIMES_9x,
+                                               queue_id,
+                                               skb_queue_len(&ring->queue));
                                        break;
                                }
                        }
-                       RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                "Set ERFSLEEP awaked:%d ms\n",
-                                 jiffies_to_msecs(jiffies -
-                                 ppsc->last_awake_jiffies));
+                       rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
+                               "Set ERFSLEEP awaked:%d ms\n",
+                               jiffies_to_msecs(jiffies -
+                               ppsc->last_awake_jiffies));
                        ppsc->last_sleep_jiffies = jiffies;
                        _rtl88ee_phy_set_rf_sleep(hw);
                        break;
                }
        default:
-               RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
-                        "switch case %#x not processed\n", rfpwr_state);
+               rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,
+                       "switch case %#x not processed\n", rfpwr_state);
                bresult = false;
                break;
        }