forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-11 223293205a7265c8b02882461ba8996650048ade 
 kernel/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
....@@ -1,27 +1,5 @@
1
-/******************************************************************************
2
- *
3
- * Copyright(c) 2009-2010  Realtek Corporation.
4
- *
5
- * This program is free software; you can redistribute it and/or modify it
6
- * under the terms of version 2 of the GNU General Public License as
7
- * published by the Free Software Foundation.
8
- *
9
- * This program is distributed in the hope that it will be useful, but WITHOUT
10
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
12
- * more details.
13
- *
14
- * The full GNU General Public License is included in this distribution in the
15
- * file called LICENSE.
16
- *
17
- * Contact Information:
18
- * wlanfae <wlanfae@realtek.com>
19
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
20
- * Hsinchu 300, Taiwan.
21
- *
22
- * Larry Finger <Larry.Finger@lwfinger.net>
23
- *
24
- *****************************************************************************/
1
+// SPDX-License-Identifier: GPL-2.0
2
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
253 
264 #include "../wifi.h"
275 #include "../pci.h"
....@@ -49,7 +27,12 @@
4927 static void _rtl8821ae_phy_rf_serial_write(struct ieee80211_hw *hw,
5028 					   enum radio_path rfpath, u32 offset,
5129 					   u32 data);
52
-static u32 _rtl8821ae_phy_calculate_bit_shift(u32 bitmask);
30
+static u32 _rtl8821ae_phy_calculate_bit_shift(u32 bitmask)
31
+{
32
+	u32 i = ffs(bitmask);
33
+
34
+	return i ? i - 1 : 32;
35
+}
5336 static bool _rtl8821ae_phy_bb8821a_config_parafile(struct ieee80211_hw *hw);
5437 /*static bool _rtl8812ae_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);*/
5538 static bool _rtl8821ae_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);
....@@ -118,16 +101,16 @@
118101 	struct rtl_priv *rtlpriv = rtl_priv(hw);
119102 	u32 returnvalue, originalvalue, bitshift;
120103 
121
-	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
122
-		 "regaddr(%#x), bitmask(%#x)\n",
123
-		 regaddr, bitmask);
104
+	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
105
+		"regaddr(%#x), bitmask(%#x)\n",
106
+		regaddr, bitmask);
124107 	originalvalue = rtl_read_dword(rtlpriv, regaddr);
125108 	bitshift = _rtl8821ae_phy_calculate_bit_shift(bitmask);
126109 	returnvalue = (originalvalue & bitmask) >> bitshift;
127110 
128
-	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
129
-		 "BBR MASK=0x%x Addr[0x%x]=0x%x\n",
130
-		 bitmask, regaddr, originalvalue);
111
+	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
112
+		"BBR MASK=0x%x Addr[0x%x]=0x%x\n",
113
+		bitmask, regaddr, originalvalue);
131114 	return returnvalue;
132115 }
133116 
....@@ -137,9 +120,9 @@
137120 	struct rtl_priv *rtlpriv = rtl_priv(hw);
138121 	u32 originalvalue, bitshift;
139122 
140
-	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
141
-		 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
142
-		 regaddr, bitmask, data);
123
+	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
124
+		"regaddr(%#x), bitmask(%#x), data(%#x)\n",
125
+		regaddr, bitmask, data);
143126 
144127 	if (bitmask != MASKDWORD) {
145128 		originalvalue = rtl_read_dword(rtlpriv, regaddr);
....@@ -150,9 +133,9 @@
150133 
151134 	rtl_write_dword(rtlpriv, regaddr, data);
152135 
153
-	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
154
-		 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
155
-		 regaddr, bitmask, data);
136
+	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
137
+		"regaddr(%#x), bitmask(%#x), data(%#x)\n",
138
+		regaddr, bitmask, data);
156139 }
157140 
158141 u32 rtl8821ae_phy_query_rf_reg(struct ieee80211_hw *hw,
....@@ -161,23 +144,22 @@
161144 {
162145 	struct rtl_priv *rtlpriv = rtl_priv(hw);
163146 	u32 original_value, readback_value, bitshift;
164
-	unsigned long flags;
165147 
166
-	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
167
-		 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
168
-		 regaddr, rfpath, bitmask);
148
+	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
149
+		"regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
150
+		regaddr, rfpath, bitmask);
169151 
170
-	spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
152
+	spin_lock(&rtlpriv->locks.rf_lock);
171153 
172154 	original_value = _rtl8821ae_phy_rf_serial_read(hw, rfpath, regaddr);
173155 	bitshift = _rtl8821ae_phy_calculate_bit_shift(bitmask);
174156 	readback_value = (original_value & bitmask) >> bitshift;
175157 
176
-	spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
158
+	spin_unlock(&rtlpriv->locks.rf_lock);
177159 
178
-	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
179
-		 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
180
-		 regaddr, rfpath, bitmask, original_value);
160
+	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
161
+		"regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
162
+		regaddr, rfpath, bitmask, original_value);
181163 
182164 	return readback_value;
183165 }
....@@ -188,13 +170,12 @@
188170 {
189171 	struct rtl_priv *rtlpriv = rtl_priv(hw);
190172 	u32 original_value, bitshift;
191
-	unsigned long flags;
192173 
193
-	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
194
-		 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
195
-		  regaddr, bitmask, data, rfpath);
174
+	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
175
+		"regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
176
+		regaddr, bitmask, data, rfpath);
196177 
197
-	spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
178
+	spin_lock(&rtlpriv->locks.rf_lock);
198179 
199180 	if (bitmask != RFREG_OFFSET_MASK) {
200181 		original_value =
....@@ -205,10 +186,10 @@
205186 
206187 	_rtl8821ae_phy_rf_serial_write(hw, rfpath, regaddr, data);
207188 
208
-	spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
189
+	spin_unlock(&rtlpriv->locks.rf_lock);
209190 
210
-	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
211
-		 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
191
+	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
192
+		"regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
212193 		 regaddr, bitmask, data, rfpath);
213194 }
214195 
....@@ -291,20 +272,9 @@
291272 	data_and_addr = ((newoffset << 20) |
292273 			 (data & 0x000fffff)) & 0x0fffffff;
293274 	rtl_set_bbreg(hw, pphyreg->rf3wire_offset, MASKDWORD, data_and_addr);
294
-	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
295
-		 "RFW-%d Addr[0x%x]=0x%x\n",
296
-		 rfpath, pphyreg->rf3wire_offset, data_and_addr);
297
-}
298
-
299
-static u32 _rtl8821ae_phy_calculate_bit_shift(u32 bitmask)
300
-{
301
-	u32 i;
302
-
303
-	for (i = 0; i <= 31; i++) {
304
-		if (((bitmask >> i) & 0x1) == 1)
305
-			break;
306
-	}
307
-	return i;
275
+	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
276
+		"RFW-%d Addr[0x%x]=0x%x\n",
277
+		rfpath, pphyreg->rf3wire_offset, data_and_addr);
308278 }
309279 
310280 bool rtl8821ae_phy_mac_config(struct ieee80211_hw *hw)
....@@ -394,6 +364,7 @@
394364 			rtl_set_bbreg(hw, RB_RFE_INV, BMASKRFEINV, 0x000);
395365 			break;
396366 		}
367
+		fallthrough;
397368 	case 0:
398369 	case 2:
399370 	default:
....@@ -473,10 +444,10 @@
473444 	u32  out = 0x200;
474445 	const s8 auto_temp = -1;
475446 
476
-	RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
477
-		 "===> PHY_GetTxBBSwing_8812A, bbSwing_2G: %d, bbSwing_5G: %d,autoload_failflag=%d.\n",
478
-		 (int)swing_2g, (int)swing_5g,
479
-		 (int)rtlefuse->autoload_failflag);
447
+	rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD,
448
+		"===> PHY_GetTXBBSwing_8812A, bbSwing_2G: %d, bbSwing_5G: %d,autoload_failflag=%d.\n",
449
+		(int)swing_2g, (int)swing_5g,
450
+		(int)rtlefuse->autoload_failflag);
480451 
481452 	if (rtlefuse->autoload_failflag) {
482453 		if (band == BAND_ON_2_4G) {
....@@ -554,9 +525,9 @@
554525 
555526 		swing_a = (swing & 0x3) >> 0; /* 0xC6/C7[1:0] */
556527 		swing_b = (swing & 0xC) >> 2; /* 0xC6/C7[3:2] */
557
-		RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
558
-			 "===> PHY_GetTxBBSwing_8812A, swingA: 0x%X, swingB: 0x%X\n",
559
-			 swing_a, swing_b);
528
+		rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD,
529
+			"===> PHY_GetTXBBSwing_8812A, swingA: 0x%X, swingB: 0x%X\n",
530
+			swing_a, swing_b);
560531 
561532 		/* 3 Path-A */
562533 		if (swing_a == 0x0) {
....@@ -612,8 +583,8 @@
612583 		}
613584 	}
614585 
615
-	RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
616
-		 "<=== PHY_GetTxBBSwing_8812A, out = 0x%X\n", out);
586
+	rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD,
587
+		"<=== PHY_GetTXBBSwing_8812A, out = 0x%X\n", out);
617588 	return out;
618589 }
619590 
....@@ -675,23 +646,23 @@
675646 
676647 		count = 0;
677648 		reg_41a = rtl_read_word(rtlpriv, REG_TXPKT_EMPTY);
678
-		RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
679
-			 "Reg41A value %d\n", reg_41a);
649
+		rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD,
650
+			"Reg41A value %d\n", reg_41a);
680651 		reg_41a &= 0x30;
681652 		while ((reg_41a != 0x30) && (count < 50)) {
682653 			udelay(50);
683
-			RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD, "Delay 50us\n");
654
+			rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD, "Delay 50us\n");
684655 
685656 			reg_41a = rtl_read_word(rtlpriv, REG_TXPKT_EMPTY);
686657 			reg_41a &= 0x30;
687658 			count++;
688
-			RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
689
-				 "Reg41A value %d\n", reg_41a);
659
+			rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD,
660
+				"Reg41A value %d\n", reg_41a);
690661 		}
691662 		if (count != 0)
692
-			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
693
-				 "PHY_SwitchWirelessBand8812(): Switch to 5G Band. Count = %d reg41A=0x%x\n",
694
-				 count, reg_41a);
663
+			rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
664
+				"PHY_SwitchWirelessBand8812(): Switch to 5G Band. Count = %d reg41A=0x%x\n",
665
+				count, reg_41a);
695666 
696667 		/* 2012/02/01, Sinda add registry to switch workaround
697668 		without long-run verification for scan issue. */
....@@ -716,9 +687,9 @@
716687 		rtl_set_bbreg(hw, RTXPATH, 0xf0, 0);
717688 		rtl_set_bbreg(hw, RCCK_RX, 0x0f000000, 0xf);
718689 
719
-		RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
720
-			 "==>PHY_SwitchWirelessBand8812() BAND_ON_5G settings OFDM index 0x%x\n",
721
-			 rtlpriv->dm.ofdm_index[RF90_PATH_A]);
690
+		rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD,
691
+			"==>PHY_SwitchWirelessBand8812() BAND_ON_5G settings OFDM index 0x%x\n",
692
+			rtlpriv->dm.ofdm_index[RF90_PATH_A]);
722693 	}
723694 
724695 	if ((rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) ||
....@@ -745,8 +716,8 @@
745716 		rtl8821ae_dm_clear_txpower_tracking_state(hw);
746717 	}
747718 
748
-	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
749
-		 "<==rtl8821ae_phy_switch_wirelessband():Switch Band OK.\n");
719
+	rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE,
720
+		"<==%s():Switch Band OK.\n", __func__);
750721 	return;
751722 }
752723 
....@@ -779,18 +750,18 @@
779750 		      rtlhal->type_alna << 16 |
780751 		      rtlhal->type_apa  << 24;
781752 
782
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
783
-		 "===> [8812A] CheckPositive (cond1, cond2) = (0x%X 0x%X)\n",
784
-		 cond1, cond2);
785
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
786
-		 "===> [8812A] CheckPositive (driver1, driver2) = (0x%X 0x%X)\n",
787
-		 driver1, driver2);
753
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
754
+		"===> [8812A] CheckPositive (cond1, cond2) = (0x%X 0x%X)\n",
755
+		cond1, cond2);
756
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
757
+		"===> [8812A] CheckPositive (driver1, driver2) = (0x%X 0x%X)\n",
758
+		driver1, driver2);
788759 
789
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
790
-		 "	(Platform, Interface) = (0x%X, 0x%X)\n", 0x04, intf);
791
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
792
-		 "	(Board, Package) = (0x%X, 0x%X)\n",
793
-		 rtlhal->board_type, rtlhal->package_type);
760
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
761
+		"	(Platform, Interface) = (0x%X, 0x%X)\n", 0x04, intf);
762
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
763
+		"	(Board, Package) = (0x%X, 0x%X)\n",
764
+		rtlhal->board_type, rtlhal->package_type);
794765 
795766 	/*============== Value Defined Check ===============*/
796767 	/*QFN Type [15:12] and Cut Version [27:24] need to do value check*/
....@@ -941,7 +912,7 @@
941912 	struct rtl_phy *rtlphy = &rtlpriv->phy;
942913 
943914 	if (path > RF90_PATH_D) {
944
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
915
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
945916 			"Invalid Rf Path %d in phy_SetTxPowerByRatBase()\n", path);
946917 		return;
947918 	}
....@@ -967,9 +938,9 @@
967938 			rtlphy->txpwr_by_rate_base_24g[path][txnum][5] = value;
968939 			break;
969940 		default:
970
-			RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
971
-				 "Invalid RateSection %d in Band 2.4G,Rf Path %d, %dTx in PHY_SetTxPowerByRateBase()\n",
972
-				 rate_section, path, txnum);
941
+			rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
942
+				"Invalid RateSection %d in Band 2.4G,Rf Path %d, %dTx in PHY_SetTxPowerByRateBase()\n",
943
+				rate_section, path, txnum);
973944 			break;
974945 		}
975946 	} else if (band == BAND_ON_5G) {
....@@ -990,13 +961,13 @@
990961 			rtlphy->txpwr_by_rate_base_5g[path][txnum][4] = value;
991962 			break;
992963 		default:
993
-			RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
964
+			rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
994965 				"Invalid RateSection %d in Band 5G, Rf Path %d, %dTx in PHY_SetTxPowerByRateBase()\n",
995966 				rate_section, path, txnum);
996967 			break;
997968 		}
998969 	} else {
999
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
970
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1000971 			"Invalid Band %d in PHY_SetTxPowerByRateBase()\n", band);
1001972 	}
1002973 }
....@@ -1010,9 +981,9 @@
1010981 	u8 value = 0;
1011982 
1012983 	if (path > RF90_PATH_D) {
1013
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1014
-			 "Invalid Rf Path %d in PHY_GetTxPowerByRateBase()\n",
1015
-			 path);
984
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
985
+			"Invalid Rf Path %d in PHY_GetTxPowerByRateBase()\n",
986
+			path);
1016987 		return 0;
1017988 	}
1018989 
....@@ -1037,9 +1008,9 @@
10371008 			value = rtlphy->txpwr_by_rate_base_24g[path][txnum][5];
10381009 			break;
10391010 		default:
1040
-			RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1041
-				 "Invalid RateSection %d in Band 2.4G, Rf Path %d, %dTx in PHY_GetTxPowerByRateBase()\n",
1042
-				 rate_section, path, txnum);
1011
+			rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1012
+				"Invalid RateSection %d in Band 2.4G, Rf Path %d, %dTx in PHY_GetTxPowerByRateBase()\n",
1013
+				rate_section, path, txnum);
10431014 			break;
10441015 		}
10451016 	} else if (band == BAND_ON_5G) {
....@@ -1060,14 +1031,14 @@
10601031 			value = rtlphy->txpwr_by_rate_base_5g[path][txnum][4];
10611032 			break;
10621033 		default:
1063
-			RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1064
-				 "Invalid RateSection %d in Band 5G, Rf Path %d, %dTx in PHY_GetTxPowerByRateBase()\n",
1065
-				 rate_section, path, txnum);
1034
+			rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1035
+				"Invalid RateSection %d in Band 5G, Rf Path %d, %dTx in PHY_GetTxPowerByRateBase()\n",
1036
+				rate_section, path, txnum);
10661037 			break;
10671038 		}
10681039 	} else {
1069
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1070
-			 "Invalid Band %d in PHY_GetTxPowerByRateBase()\n", band);
1040
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1041
+			"Invalid Band %d in PHY_GetTxPowerByRateBase()\n", band);
10711042 	}
10721043 
10731044 	return value;
....@@ -1077,52 +1048,52 @@
10771048 {
10781049 	struct rtl_priv *rtlpriv = rtl_priv(hw);
10791050 	struct rtl_phy *rtlphy = &rtlpriv->phy;
1080
-	u16 rawValue = 0;
1051
+	u16 rawvalue = 0;
10811052 	u8 base = 0, path = 0;
10821053 
10831054 	for (path = RF90_PATH_A; path <= RF90_PATH_B; ++path) {
1084
-		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][0] >> 24) & 0xFF;
1085
-		base = (rawValue >> 4) * 10 + (rawValue & 0xF);
1055
+		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][0] >> 24) & 0xFF;
1056
+		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
10861057 		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, CCK, RF_1TX, base);
10871058 
1088
-		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][2] >> 24) & 0xFF;
1089
-		base = (rawValue >> 4) * 10 + (rawValue & 0xF);
1059
+		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][2] >> 24) & 0xFF;
1060
+		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
10901061 		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, OFDM, RF_1TX, base);
10911062 
1092
-		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][4] >> 24) & 0xFF;
1093
-		base = (rawValue >> 4) * 10 + (rawValue & 0xF);
1063
+		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][4] >> 24) & 0xFF;
1064
+		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
10941065 		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, HT_MCS0_MCS7, RF_1TX, base);
10951066 
1096
-		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_2TX][6] >> 24) & 0xFF;
1097
-		base = (rawValue >> 4) * 10 + (rawValue & 0xF);
1067
+		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_2TX][6] >> 24) & 0xFF;
1068
+		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
10981069 		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, HT_MCS8_MCS15, RF_2TX, base);
10991070 
1100
-		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][8] >> 24) & 0xFF;
1101
-		base = (rawValue >> 4) * 10 + (rawValue & 0xF);
1071
+		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][8] >> 24) & 0xFF;
1072
+		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
11021073 		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);
11031074 
1104
-		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_2TX][11] >> 8) & 0xFF;
1105
-		base = (rawValue >> 4) * 10 + (rawValue & 0xF);
1075
+		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_2TX][11] >> 8) & 0xFF;
1076
+		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
11061077 		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);
11071078 
1108
-		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][2] >> 24) & 0xFF;
1109
-		base = (rawValue >> 4) * 10 + (rawValue & 0xF);
1079
+		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][2] >> 24) & 0xFF;
1080
+		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
11101081 		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, OFDM, RF_1TX, base);
11111082 
1112
-		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][4] >> 24) & 0xFF;
1113
-		base = (rawValue >> 4) * 10 + (rawValue & 0xF);
1083
+		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][4] >> 24) & 0xFF;
1084
+		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
11141085 		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, HT_MCS0_MCS7, RF_1TX, base);
11151086 
1116
-		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_2TX][6] >> 24) & 0xFF;
1117
-		base = (rawValue >> 4) * 10 + (rawValue & 0xF);
1087
+		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_2TX][6] >> 24) & 0xFF;
1088
+		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
11181089 		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, HT_MCS8_MCS15, RF_2TX, base);
11191090 
1120
-		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][8] >> 24) & 0xFF;
1121
-		base = (rawValue >> 4) * 10 + (rawValue & 0xF);
1091
+		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][8] >> 24) & 0xFF;
1092
+		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
11221093 		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);
11231094 
1124
-		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_2TX][11] >> 8) & 0xFF;
1125
-		base = (rawValue >> 4) * 10 + (rawValue & 0xF);
1095
+		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_2TX][11] >> 8) & 0xFF;
1096
+		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);
11261097 		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);
11271098 	}
11281099 }
....@@ -1167,7 +1138,7 @@
11671138 						[bw][rate_section][channel][RF90_PATH_A];
11681139 					if (temp_pwrlmt == MAX_POWER_INDEX) {
11691140 						if (bw == 0 || bw == 1) { /*5G 20M 40M VHT and HT can cross reference*/
1170
-							RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1141
+							rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
11711142 								"No power limit table of the specified band %d, bandwidth %d, ratesection %d, channel %d, rf path %d\n",
11721143 								1, bw, rate_section, channel, RF90_PATH_A);
11731144 							if (rate_section == 2) {
....@@ -1184,7 +1155,9 @@
11841155 									rtlphy->txpwr_limit_5g[regulation][bw][3][channel][RF90_PATH_A];
11851156 							}
11861157 
1187
-							RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "use other value %d\n", temp_pwrlmt);
1158
+							rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1159
+								"use other value %d\n",
1160
+								temp_pwrlmt);
11881161 						}
11891162 					}
11901163 				}
....@@ -1241,7 +1214,7 @@
12411214 			break;
12421215 
12431216 		default:
1244
-			RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1217
+			rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
12451218 				"Wrong rate 0x%x to obtain index in 2.4G in PHY_GetTxPowerByRateBaseIndex()\n",
12461219 				rate);
12471220 			break;
....@@ -1308,7 +1281,7 @@
13081281 			break;
13091282 
13101283 		default:
1311
-			RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1284
+			rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
13121285 				"Wrong rate 0x%x to obtain index in 5G in PHY_GetTxPowerByRateBaseIndex()\n",
13131286 				rate);
13141287 			break;
....@@ -1329,7 +1302,7 @@
13291302 	s8 temp_value = 0, temp_pwrlmt = 0;
13301303 	u8 rf_path = 0;
13311304 
1332
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1305
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
13331306 		"=====> _rtl8812ae_phy_convert_txpower_limit_to_power_index()\n");
13341307 
13351308 	_rtl8812ae_phy_cross_reference_ht_and_vht_txpower_limit(hw);
....@@ -1378,8 +1351,8 @@
13781351 								temp_value;
13791352 						}
13801353 
1381
-						RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1382
-							"TxPwrLimit_2_4G[regulation %d][bw %d][rateSection %d][channel %d] = %d\n(TxPwrLimit in dBm %d - BW40PwrLmt2_4G[channel %d][rfPath %d] %d)\n",
1354
+						rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1355
+							"TxPwrLimit_2_4G[regulation %d][bw %d][rateSection %d][channel %d] = %d\n(TxPwrLimit in dBm %d - BW40PwrLmt2_4G[channel %d][rfpath %d] %d)\n",
13831356 							regulation, bw, rate_section, channel,
13841357 							rtlphy->txpwr_limit_2_4g[regulation][bw]
13851358 							[rate_section][channel][rf_path], (temp_pwrlmt == 63)
....@@ -1443,8 +1416,8 @@
14431416 								[rf_path] = temp_value;
14441417 						}
14451418 
1446
-						RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1447
-							"TxPwrLimit_5G[regulation %d][bw %d][rateSection %d][channel %d] =%d\n(TxPwrLimit in dBm %d - BW40PwrLmt5G[chnl group %d][rfPath %d] %d)\n",
1419
+						rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1420
+							"TxPwrLimit_5G[regulation %d][bw %d][rateSection %d][channel %d] =%d\n(TxPwrLimit in dBm %d - BW40PwrLmt5G[chnl group %d][rfpath %d] %d)\n",
14481421 							regulation, bw, rate_section,
14491422 							channel, rtlphy->txpwr_limit_5g[regulation]
14501423 							[bw][rate_section][channel][rf_path],
....@@ -1454,8 +1427,8 @@
14541427 			}
14551428 		}
14561429 	}
1457
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1458
-		 "<===== _rtl8812ae_phy_convert_txpower_limit_to_power_index()\n");
1430
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1431
+		"<===== %s()\n", __func__);
14591432 }
14601433 
14611434 static void _rtl8821ae_phy_init_txpower_limit(struct ieee80211_hw *hw)
....@@ -1464,8 +1437,8 @@
14641437 	struct rtl_phy *rtlphy = &rtlpriv->phy;
14651438 	u8 i, j, k, l, m;
14661439 
1467
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1468
-		 "=====> _rtl8821ae_phy_init_txpower_limit()!\n");
1440
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1441
+		"=====>`%s()!\n", __func__);
14691442 
14701443 	for (i = 0; i < MAX_REGULATION_NUM; ++i) {
14711444 		for (j = 0; j < MAX_2_4G_BANDWIDTH_NUM; ++j)
....@@ -1486,118 +1459,118 @@
14861459 							= MAX_POWER_INDEX;
14871460 	}
14881461 
1489
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1490
-		 "<===== _rtl8821ae_phy_init_txpower_limit()!\n");
1462
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1463
+		"<===== %s()!\n", __func__);
14911464 }
14921465 
14931466 static void _rtl8821ae_phy_convert_txpower_dbm_to_relative_value(struct ieee80211_hw *hw)
14941467 {
14951468 	struct rtl_priv *rtlpriv = rtl_priv(hw);
14961469 	struct rtl_phy *rtlphy = &rtlpriv->phy;
1497
-	u8 base = 0, rfPath = 0;
1470
+	u8 base = 0, rfpath = 0;
14981471 
1499
-	for (rfPath = RF90_PATH_A; rfPath <= RF90_PATH_B; ++rfPath) {
1500
-		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_1TX, CCK);
1472
+	for (rfpath = RF90_PATH_A; rfpath <= RF90_PATH_B; ++rfpath) {
1473
+		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_1TX, CCK);
15011474 		_phy_convert_txpower_dbm_to_relative_value(
1502
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][0],
1475
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][0],
15031476 			0, 3, base);
15041477 
1505
-		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_1TX, OFDM);
1478
+		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_1TX, OFDM);
15061479 		_phy_convert_txpower_dbm_to_relative_value(
1507
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][1],
1480
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][1],
15081481 			0, 3, base);
15091482 		_phy_convert_txpower_dbm_to_relative_value(
1510
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][2],
1483
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][2],
15111484 			0, 3, base);
15121485 
1513
-		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_1TX, HT_MCS0_MCS7);
1486
+		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_1TX, HT_MCS0_MCS7);
15141487 		_phy_convert_txpower_dbm_to_relative_value(
1515
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][3],
1488
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][3],
15161489 			0, 3, base);
15171490 		_phy_convert_txpower_dbm_to_relative_value(
1518
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][4],
1491
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][4],
15191492 			0, 3, base);
15201493 
1521
-		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_2TX, HT_MCS8_MCS15);
1494
+		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_2TX, HT_MCS8_MCS15);
15221495 
15231496 		_phy_convert_txpower_dbm_to_relative_value(
1524
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_2TX][5],
1497
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_2TX][5],
15251498 			0, 3, base);
15261499 
15271500 		_phy_convert_txpower_dbm_to_relative_value(
1528
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_2TX][6],
1501
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_2TX][6],
15291502 			0, 3, base);
15301503 
1531
-		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_1TX, VHT_1SSMCS0_1SSMCS9);
1504
+		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_1TX, VHT_1SSMCS0_1SSMCS9);
15321505 		_phy_convert_txpower_dbm_to_relative_value(
1533
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][7],
1506
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][7],
15341507 			0, 3, base);
15351508 		_phy_convert_txpower_dbm_to_relative_value(
1536
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][8],
1509
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][8],
15371510 			0, 3, base);
15381511 		_phy_convert_txpower_dbm_to_relative_value(
1539
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][9],
1512
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][9],
15401513 			0, 1, base);
15411514 
1542
-		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_2TX, VHT_2SSMCS0_2SSMCS9);
1515
+		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_2TX, VHT_2SSMCS0_2SSMCS9);
15431516 		_phy_convert_txpower_dbm_to_relative_value(
1544
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][9],
1517
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][9],
15451518 			2, 3, base);
15461519 		_phy_convert_txpower_dbm_to_relative_value(
1547
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_2TX][10],
1520
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_2TX][10],
15481521 			0, 3, base);
15491522 		_phy_convert_txpower_dbm_to_relative_value(
1550
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_2TX][11],
1523
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_2TX][11],
15511524 			0, 3, base);
15521525 
1553
-		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfPath, RF_1TX, OFDM);
1526
+		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfpath, RF_1TX, OFDM);
15541527 		_phy_convert_txpower_dbm_to_relative_value(
1555
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][1],
1528
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][1],
15561529 			0, 3, base);
15571530 		_phy_convert_txpower_dbm_to_relative_value(
1558
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][2],
1531
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][2],
15591532 			0, 3, base);
15601533 
1561
-		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfPath, RF_1TX, HT_MCS0_MCS7);
1534
+		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfpath, RF_1TX, HT_MCS0_MCS7);
15621535 		_phy_convert_txpower_dbm_to_relative_value(
1563
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][3],
1536
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][3],
15641537 			0, 3, base);
15651538 		_phy_convert_txpower_dbm_to_relative_value(
1566
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][4],
1539
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][4],
15671540 			0, 3, base);
15681541 
1569
-		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfPath, RF_2TX, HT_MCS8_MCS15);
1542
+		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfpath, RF_2TX, HT_MCS8_MCS15);
15701543 		_phy_convert_txpower_dbm_to_relative_value(
1571
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_2TX][5],
1544
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_2TX][5],
15721545 			0, 3, base);
15731546 		_phy_convert_txpower_dbm_to_relative_value(
1574
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_2TX][6],
1547
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_2TX][6],
15751548 			0, 3, base);
15761549 
1577
-		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfPath, RF_1TX, VHT_1SSMCS0_1SSMCS9);
1550
+		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfpath, RF_1TX, VHT_1SSMCS0_1SSMCS9);
15781551 		_phy_convert_txpower_dbm_to_relative_value(
1579
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][7],
1552
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][7],
15801553 			0, 3, base);
15811554 		_phy_convert_txpower_dbm_to_relative_value(
1582
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][8],
1555
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][8],
15831556 			0, 3, base);
15841557 		_phy_convert_txpower_dbm_to_relative_value(
1585
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][9],
1558
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][9],
15861559 			0, 1, base);
15871560 
1588
-		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfPath, RF_2TX, VHT_2SSMCS0_2SSMCS9);
1561
+		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfpath, RF_2TX, VHT_2SSMCS0_2SSMCS9);
15891562 		_phy_convert_txpower_dbm_to_relative_value(
1590
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][9],
1563
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][9],
15911564 			2, 3, base);
15921565 		_phy_convert_txpower_dbm_to_relative_value(
1593
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_2TX][10],
1566
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_2TX][10],
15941567 			0, 3, base);
15951568 		_phy_convert_txpower_dbm_to_relative_value(
1596
-			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_2TX][11],
1569
+			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_2TX][11],
15971570 			0, 3, base);
15981571 	}
15991572 
1600
-	RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
1573
+	rtl_dbg(rtlpriv, COMP_POWER, DBG_TRACE,
16011574 		"<===_rtl8821ae_phy_convert_txpower_dbm_to_relative_value()\n");
16021575 }
16031576 
....@@ -1653,13 +1626,13 @@
16531626 				channel_index = i;
16541627 		}
16551628 	} else
1656
-		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "Invalid Band %d in %s\n",
1657
-			 band,  __func__);
1629
+		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD, "Invalid Band %d in %s\n",
1630
+			band,  __func__);
16581631 
16591632 	if (channel_index == -1)
1660
-		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
1661
-			 "Invalid Channel %d of Band %d in %s\n", channel,
1662
-			 band, __func__);
1633
+		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
1634
+			"Invalid Channel %d of Band %d in %s\n", channel,
1635
+			band, __func__);
16631636 
16641637 	return channel_index;
16651638 }
....@@ -1678,9 +1651,9 @@
16781651 	if (!_rtl8812ae_get_integer_from_string((char *)pchannel, &channel) ||
16791652 	    !_rtl8812ae_get_integer_from_string((char *)ppower_limit,
16801653 						&power_limit)) {
1681
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1682
-			 "Illegal index of pwr_lmt table [chnl %d][val %d]\n",
1683
-			  channel, power_limit);
1654
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1655
+			"Illegal index of pwr_lmt table [chnl %d][val %d]\n",
1656
+			channel, power_limit);
16841657 	}
16851658 
16861659 	power_limit = power_limit > MAX_POWER_INDEX ?
....@@ -1740,10 +1713,10 @@
17401713 				[rate_section][channel_index][RF90_PATH_A] =
17411714 								   power_limit;
17421715 
1743
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1744
-			 "2.4G [regula %d][bw %d][sec %d][chnl %d][val %d]\n",
1745
-			  regulation, bandwidth, rate_section, channel_index,
1746
-			  rtlphy->txpwr_limit_2_4g[regulation][bandwidth]
1716
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1717
+			"2.4G [regula %d][bw %d][sec %d][chnl %d][val %d]\n",
1718
+			regulation, bandwidth, rate_section, channel_index,
1719
+			rtlphy->txpwr_limit_2_4g[regulation][bandwidth]
17471720 				[rate_section][channel_index][RF90_PATH_A]);
17481721 	} else if (_rtl8812ae_eq_n_byte(pband, (u8 *)("5G"), 2)) {
17491722 		ret = _rtl8812ae_phy_get_chnl_idx_of_txpwr_lmt(hw,
....@@ -1763,14 +1736,14 @@
17631736 			rtlphy->txpwr_limit_5g[regulation][bandwidth]
17641737 			[rate_section][channel_index][RF90_PATH_A] = power_limit;
17651738 
1766
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1767
-			 "5G: [regul %d][bw %d][sec %d][chnl %d][val %d]\n",
1768
-			  regulation, bandwidth, rate_section, channel,
1769
-			  rtlphy->txpwr_limit_5g[regulation][bandwidth]
1739
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1740
+			"5G: [regul %d][bw %d][sec %d][chnl %d][val %d]\n",
1741
+			regulation, bandwidth, rate_section, channel,
1742
+			rtlphy->txpwr_limit_5g[regulation][bandwidth]
17701743 				[rate_section][channel_index][RF90_PATH_A]);
17711744 	} else {
1772
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1773
-			 "Cannot recognize the band info in %s\n", pband);
1745
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1746
+			"Cannot recognize the band info in %s\n", pband);
17741747 		return;
17751748 	}
17761749 }
....@@ -1802,8 +1775,7 @@
18021775 		array = RTL8821AE_TXPWR_LMT;
18031776 	}
18041777 
1805
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1806
-		 "\n");
1778
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, "\n");
18071779 
18081780 	for (i = 0; i < array_len; i += 7) {
18091781 		u8 *regulation = array[i];
....@@ -1835,7 +1807,7 @@
18351807 
18361808 	rtstatus = _rtl8821ae_phy_config_bb_with_headerfile(hw,
18371809 						       BASEBAND_CONFIG_PHY_REG);
1838
-	if (rtstatus != true) {
1810
+	if (!rtstatus) {
18391811 		pr_err("Write BB Reg Fail!!\n");
18401812 		return false;
18411813 	}
....@@ -1844,7 +1816,7 @@
18441816 		rtstatus = _rtl8821ae_phy_config_bb_with_pgheaderfile(hw,
18451817 						    BASEBAND_CONFIG_PHY_REG);
18461818 	}
1847
-	if (rtstatus != true) {
1819
+	if (!rtstatus) {
18481820 		pr_err("BB_PG Reg Fail!!\n");
18491821 		return false;
18501822 	}
....@@ -1858,7 +1830,7 @@
18581830 	rtstatus = _rtl8821ae_phy_config_bb_with_headerfile(hw,
18591831 						BASEBAND_CONFIG_AGC_TAB);
18601832 
1861
-	if (rtstatus != true) {
1833
+	if (!rtstatus) {
18621834 		pr_err("AGC Table Fail\n");
18631835 		return false;
18641836 	}
....@@ -1926,7 +1898,7 @@
19261898 	u32 arraylength;
19271899 	u32 *ptrarray;
19281900 
1929
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read MAC_REG_Array\n");
1901
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, "Read MAC_REG_Array\n");
19301902 	if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
19311903 		arraylength = RTL8821AE_MAC_1T_ARRAYLEN;
19321904 		ptrarray = RTL8821AE_MAC_REG_ARRAY;
....@@ -1934,8 +1906,8 @@
19341906 		arraylength = RTL8812AE_MAC_1T_ARRAYLEN;
19351907 		ptrarray = RTL8812AE_MAC_REG_ARRAY;
19361908 	}
1937
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1938
-		 "Img: MAC_REG_ARRAY LEN %d\n", arraylength);
1909
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1910
+		"Img: MAC_REG_ARRAY LEN %d\n", arraylength);
19391911 
19401912 	return __rtl8821ae_phy_config_with_headerfile(hw,
19411913 			ptrarray, arraylength, rtl_write_byte_with_val32);
....@@ -2001,22 +1973,22 @@
20011973 	u8 rate_section = _rtl8821ae_get_rate_section_index(regaddr);
20021974 
20031975 	if (band != BAND_ON_2_4G && band != BAND_ON_5G) {
2004
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid Band %d\n", band);
1976
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid Band %d\n", band);
20051977 		band = BAND_ON_2_4G;
20061978 	}
20071979 	if (rfpath >= MAX_RF_PATH) {
2008
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid RfPath %d\n", rfpath);
1980
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid RfPath %d\n", rfpath);
20091981 		rfpath = MAX_RF_PATH - 1;
20101982 	}
20111983 	if (txnum >= MAX_RF_PATH) {
2012
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid TxNum %d\n", txnum);
1984
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid TxNum %d\n", txnum);
20131985 		txnum = MAX_RF_PATH - 1;
20141986 	}
20151987 	rtlphy->tx_power_by_rate_offset[band][rfpath][txnum][rate_section] = data;
2016
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
2017
-		 "TxPwrByRateOffset[Band %d][RfPath %d][TxNum %d][RateSection %d] = 0x%x\n",
2018
-		 band, rfpath, txnum, rate_section,
2019
-		 rtlphy->tx_power_by_rate_offset[band][rfpath][txnum][rate_section]);
1988
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1989
+		"TxPwrByRateOffset[Band %d][RfPath %d][TxNum %d][RateSection %d] = 0x%x\n",
1990
+		band, rfpath, txnum, rate_section,
1991
+		rtlphy->tx_power_by_rate_offset[band][rfpath][txnum][rate_section]);
20201992 }
20211993 
20221994 static bool _rtl8821ae_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
....@@ -2038,8 +2010,8 @@
20382010 	}
20392011 
20402012 	if (configtype != BASEBAND_CONFIG_PHY_REG) {
2041
-		RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
2042
-			 "configtype != BaseBand_Config_PHY_REG\n");
2013
+		rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
2014
+			"configtype != BaseBand_Config_PHY_REG\n");
20432015 		return true;
20442016 	}
20452017 	for (i = 0; i < arraylen; i += 6) {
....@@ -2097,7 +2069,6 @@
20972069 bool rtl8812ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
20982070 					     enum radio_path rfpath)
20992071 {
2100
-	bool rtstatus = true;
21012072 	u32 *radioa_array_table_a, *radioa_array_table_b;
21022073 	u16 radioa_arraylen_a, radioa_arraylen_b;
21032074 	struct rtl_priv *rtlpriv = rtl_priv(hw);
....@@ -2106,10 +2077,9 @@
21062077 	radioa_array_table_a = RTL8812AE_RADIOA_ARRAY;
21072078 	radioa_arraylen_b = RTL8812AE_RADIOB_1TARRAYLEN;
21082079 	radioa_array_table_b = RTL8812AE_RADIOB_ARRAY;
2109
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
2110
-		 "Radio_A:RTL8821AE_RADIOA_ARRAY %d\n", radioa_arraylen_a);
2111
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
2112
-	rtstatus = true;
2080
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
2081
+		"Radio_A:RTL8821AE_RADIOA_ARRAY %d\n", radioa_arraylen_a);
2082
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
21132083 	switch (rfpath) {
21142084 	case RF90_PATH_A:
21152085 		return __rtl8821ae_phy_config_with_headerfile(hw,
....@@ -2132,17 +2102,15 @@
21322102 bool rtl8821ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
21332103 						enum radio_path rfpath)
21342104 {
2135
-	bool rtstatus = true;
21362105 	u32 *radioa_array_table;
21372106 	u16 radioa_arraylen;
21382107 	struct rtl_priv *rtlpriv = rtl_priv(hw);
21392108 
21402109 	radioa_arraylen = RTL8821AE_RADIOA_1TARRAYLEN;
21412110 	radioa_array_table = RTL8821AE_RADIOA_ARRAY;
2142
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
2143
-		 "Radio_A:RTL8821AE_RADIOA_ARRAY %d\n", radioa_arraylen);
2144
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
2145
-	rtstatus = true;
2111
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
2112
+		"Radio_A:RTL8821AE_RADIOA_ARRAY %d\n", radioa_arraylen);
2113
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
21462114 	switch (rfpath) {
21472115 	case RF90_PATH_A:
21482116 		return __rtl8821ae_phy_config_with_headerfile(hw,
....@@ -2173,21 +2141,21 @@
21732141 	rtlphy->default_initialgain[3] =
21742142 	    (u8)rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, MASKBYTE0);
21752143 
2176
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
2177
-		 "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
2178
-		  rtlphy->default_initialgain[0],
2179
-		  rtlphy->default_initialgain[1],
2180
-		  rtlphy->default_initialgain[2],
2181
-		  rtlphy->default_initialgain[3]);
2144
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
2145
+		"Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
2146
+		rtlphy->default_initialgain[0],
2147
+		rtlphy->default_initialgain[1],
2148
+		rtlphy->default_initialgain[2],
2149
+		rtlphy->default_initialgain[3]);
21822150 
21832151 	rtlphy->framesync = (u8)rtl_get_bbreg(hw,
21842152 					       ROFDM0_RXDETECTOR3, MASKBYTE0);
21852153 	rtlphy->framesync_c34 = rtl_get_bbreg(hw,
21862154 					      ROFDM0_RXDETECTOR2, MASKDWORD);
21872155 
2188
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
2189
-		 "Default framesync (0x%x) = 0x%x\n",
2190
-		  ROFDM0_RXDETECTOR3, rtlphy->framesync);
2156
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
2157
+		"Default framesync (0x%x) = 0x%x\n",
2158
+		ROFDM0_RXDETECTOR3, rtlphy->framesync);
21912159 }
21922160 
21932161 static void phy_init_bb_rf_register_definition(struct ieee80211_hw *hw)
....@@ -2372,7 +2340,7 @@
23722340 	struct rtl_phy *rtlphy = &rtlpriv->phy;
23732341 	short band_temp = -1, regulation = -1, bandwidth_temp = -1,
23742342 		 rate_section = -1, channel_temp = -1;
2375
-	u16 bd, regu, bdwidth, sec, chnl;
2343
+	u16 regu, bdwidth, sec, chnl;
23762344 	s8 power_limit = MAX_POWER_INDEX;
23772345 
23782346 	if (rtlefuse->eeprom_regulatory == 2)
....@@ -2454,14 +2422,14 @@
24542422 		rate_section = 5;
24552423 		break;
24562424 	default:
2457
-		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
2425
+		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
24582426 			"Wrong rate 0x%x\n", rate);
24592427 		break;
24602428 	}
24612429 
24622430 	if (band_temp == BAND_ON_5G  && rate_section == 0)
2463
-		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
2464
-			 "Wrong rate 0x%x: No CCK in 5G Band\n", rate);
2431
+		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
2432
+			"Wrong rate 0x%x: No CCK in 5G Band\n", rate);
24652433 
24662434 	/*workaround for wrong index combination to obtain tx power limit,
24672435 	  OFDM only exists in BW 20M*/
....@@ -2486,14 +2454,13 @@
24862454 
24872455 	if (band_temp == -1 || regulation == -1 || bandwidth_temp == -1 ||
24882456 		rate_section == -1 || channel_temp == -1) {
2489
-		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
2490
-			 "Wrong index value to access power limit table [band %d][regulation %d][bandwidth %d][rf_path %d][rate_section %d][chnl %d]\n",
2491
-			 band_temp, regulation, bandwidth_temp, rf_path,
2492
-			 rate_section, channel_temp);
2457
+		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
2458
+			"Wrong index value to access power limit table [band %d][regulation %d][bandwidth %d][rf_path %d][rate_section %d][chnl %d]\n",
2459
+			band_temp, regulation, bandwidth_temp, rf_path,
2460
+			rate_section, channel_temp);
24932461 		return MAX_POWER_INDEX;
24942462 	}
24952463 
2496
-	bd = band_temp;
24972464 	regu = regulation;
24982465 	bdwidth = bandwidth_temp;
24992466 	sec = rate_section;
....@@ -2524,8 +2491,8 @@
25242491 			rtlphy->txpwr_limit_5g[regu][chnl]
25252492 			[sec][chnl][rf_path];
25262493 	} else {
2527
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
2528
-			 "No power limit table of the specified band\n");
2494
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
2495
+			"No power limit table of the specified band\n");
25292496 	}
25302497 	return power_limit;
25312498 }
....@@ -2633,7 +2600,7 @@
26332600 			else
26342601 				tx_pwr_diff = tx_pwr_diff > limit ? limit : tx_pwr_diff;
26352602 		}
2636
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2603
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
26372604 			"Maximum power by rate %d, final power by rate %d\n",
26382605 			limit, tx_pwr_diff);
26392606 	}
....@@ -2656,7 +2623,7 @@
26562623 	    (channel > 14 || channel < 1)) ||
26572624 	    ((rtlhal->current_bandtype == BAND_ON_5G) && (channel <= 14))) {
26582625 		index = 0;
2659
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2626
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
26602627 			"Illegal channel!!\n");
26612628 	}
26622629 
....@@ -2667,7 +2634,7 @@
26672634 		else if (DESC_RATE6M <= rate)
26682635 			txpower = rtlefuse->txpwrlevel_ht40_1s[path][index];
26692636 		else
2670
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "invalid rate\n");
2637
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "invalid rate\n");
26712638 
26722639 		if (DESC_RATE6M <= rate && rate <= DESC_RATE54M &&
26732640 		    !RTL8821AE_RX_HAL_IS_CCK_RATE(rate))
....@@ -2701,8 +2668,8 @@
27012668 		if (DESC_RATE6M <= rate)
27022669 			txpower = rtlefuse->txpwr_5g_bw40base[path][index];
27032670 		else
2704
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_WARNING,
2705
-				 "INVALID Rate.\n");
2671
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_WARNING,
2672
+				"INVALID Rate.\n");
27062673 
27072674 		if (DESC_RATE6M <= rate && rate <= DESC_RATE54M &&
27082675 		    !RTL8821AE_RX_HAL_IS_CCK_RATE(rate))
....@@ -2968,7 +2935,7 @@
29682935 				      MASKBYTE3, power_index);
29692936 			break;
29702937 		default:
2971
-			RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
2938
+			rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
29722939 				"Invalid Rate!!\n");
29732940 			break;
29742941 		}
....@@ -3167,13 +3134,13 @@
31673134 				      MASKBYTE3, power_index);
31683135 			break;
31693136 		default:
3170
-			RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
3171
-				 "Invalid Rate!!\n");
3137
+			rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
3138
+				"Invalid Rate!!\n");
31723139 			break;
31733140 		}
31743141 	} else {
3175
-		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
3176
-			 "Invalid RFPath!!\n");
3142
+		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
3143
+			"Invalid RFPath!!\n");
31773144 	}
31783145 }
31793146 
....@@ -3380,7 +3347,7 @@
33803347 		rtl_write_word(rtlpriv, REG_TRXPTCL_CTL, tmp & 0xFF7F);
33813348 		break;
33823349 	default:
3383
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, "unknown Bandwidth: 0x%x\n", bw);
3350
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING, "unknown Bandwidth: 0x%x\n", bw);
33843351 		break;
33853352 	}
33863353 }
....@@ -3431,11 +3398,11 @@
34313398 	u8 sub_chnl = 0;
34323399 	u8 l1pk_val = 0;
34333400 
3434
-	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
3435
-		 "Switch to %s bandwidth\n",
3436
-		  (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
3437
-		  "20MHz" :
3438
-		  (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40 ?
3401
+	rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE,
3402
+		"Switch to %s bandwidth\n",
3403
+		(rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
3404
+		 "20MHz" :
3405
+		 (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40 ?
34393406 		  "40MHz" : "80MHz")));
34403407 
34413408 	_rtl8821ae_phy_set_reg_bw(rtlpriv, rtlphy->current_chan_bw);
....@@ -3505,7 +3472,7 @@
35053472 	rtl8821ae_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
35063473 	rtlphy->set_bwmode_inprogress = false;
35073474 
3508
-	RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD, "\n");
3475
+	rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD, "\n");
35093476 }
35103477 
35113478 void rtl8821ae_phy_set_bw_mode(struct ieee80211_hw *hw,
....@@ -3522,8 +3489,8 @@
35223489 	if ((!is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw)))
35233490 		rtl8821ae_phy_set_bw_mode_callback(hw);
35243491 	else {
3525
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
3526
-			 "FALSE driver sleep or unload\n");
3492
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
3493
+			"FALSE driver sleep or unload\n");
35273494 		rtlphy->set_bwmode_inprogress = false;
35283495 		rtlphy->current_chan_bw = tmp_bw;
35293496 	}
....@@ -3538,8 +3505,8 @@
35383505 	u8 path;
35393506 	u32 data;
35403507 
3541
-	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
3542
-		 "switch to channel%d\n", rtlphy->current_channel);
3508
+	rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE,
3509
+		"switch to channel%d\n", rtlphy->current_channel);
35433510 	if (is_hal_stop(rtlhal))
35443511 		return;
35453512 
....@@ -3574,8 +3541,6 @@
35743541 			if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
35753542 				if (36 <= channel && channel <= 64)
35763543 					data = 0x114E9;
3577
-				else if (100 <= channel && channel <= 140)
3578
-					data = 0x110E9;
35793544 				else
35803545 					data = 0x110E9;
35813546 				rtl8821ae_phy_set_rf_reg(hw, path, RF_APK,
....@@ -3583,7 +3548,7 @@
35833548 			}
35843549 		}
35853550 	}
3586
-	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
3551
+	rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
35873552 }
35883553 
35893554 u8 rtl8821ae_phy_sw_chnl(struct ieee80211_hw *hw)
....@@ -3600,8 +3565,8 @@
36003565 		return 0;
36013566 
36023567 	if ((is_hal_stop(rtlhal)) || (RT_CANNOT_IO(hw))) {
3603
-		RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
3604
-			 "sw_chnl_inprogress false driver sleep or unload\n");
3568
+		rtl_dbg(rtlpriv, COMP_CHAN, DBG_LOUD,
3569
+			"sw_chnl_inprogress false driver sleep or unload\n");
36053570 		return 0;
36063571 	}
36073572 	while (rtlphy->lck_inprogress && timecount < timeout) {
....@@ -3618,30 +3583,30 @@
36183583 	if (channel == 0)
36193584 		channel = 1;
36203585 
3621
-	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
3622
-		 "switch to channel%d, band type is %d\n",
3623
-		 rtlphy->current_channel, rtlhal->current_bandtype);
3586
+	rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE,
3587
+		"switch to channel%d, band type is %d\n",
3588
+		rtlphy->current_channel, rtlhal->current_bandtype);
36243589 
36253590 	rtl8821ae_phy_sw_chnl_callback(hw);
36263591 
36273592 	rtl8821ae_dm_clear_txpower_tracking_state(hw);
36283593 	rtl8821ae_phy_set_txpower_level(hw, rtlphy->current_channel);
36293594 
3630
-	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
3595
+	rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
36313596 	rtlphy->sw_chnl_inprogress = false;
36323597 	return 1;
36333598 }
36343599 
36353600 u8 _rtl8812ae_get_right_chnl_place_for_iqk(u8 chnl)
36363601 {
3637
-	u8 channel_all[TARGET_CHNL_NUM_2G_5G_8812] = {
3602
+	static const u8 channel_all[TARGET_CHNL_NUM_2G_5G_8812] = {
36383603 		1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
36393604 		14, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54,
36403605 		56, 58, 60, 62, 64, 100, 102, 104, 106, 108,
36413606 		110, 112, 114, 116, 118, 120, 122, 124, 126,
36423607 		128, 130, 132, 134, 136, 138, 140, 149, 151,
36433608 		153, 155, 157, 159, 161, 163, 165};
3644
-	u8 place = chnl;
3609
+	u8 place;
36453610 
36463611 	if (chnl > 14) {
36473612 		for (place = 14; place < sizeof(channel_all); place++)
....@@ -3668,7 +3633,7 @@
36683633 	for (i = 0; i < mac_bb_num; i++)
36693634 		macbb_backup[i] = rtl_read_dword(rtlpriv, backup_macbb_reg[i]);
36703635 
3671
-	RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "BackupMacBB Success!!!!\n");
3636
+	rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "BackupMacBB Success!!!!\n");
36723637 }
36733638 
36743639 static void _rtl8821ae_iqk_backup_afe(struct ieee80211_hw *hw, u32 *afe_backup,
....@@ -3681,7 +3646,7 @@
36813646 	/*Save AFE Parameters */
36823647 	for (i = 0; i < afe_num; i++)
36833648 		afe_backup[i] = rtl_read_dword(rtlpriv, backup_afe_REG[i]);
3684
-	RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "BackupAFE Success!!!!\n");
3649
+	rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "BackupAFE Success!!!!\n");
36853650 }
36863651 
36873652 static void _rtl8821ae_iqk_backup_rf(struct ieee80211_hw *hw, u32 *rfa_backup,
....@@ -3699,7 +3664,7 @@
36993664 		rfb_backup[i] = rtl_get_rfreg(hw, RF90_PATH_B, backup_rf_reg[i],
37003665 					      BMASKDWORD);
37013666 	}
3702
-	RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "BackupRF Success!!!!\n");
3667
+	rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "BackupRF Success!!!!\n");
37033668 }
37043669 
37053670 static void _rtl8821ae_iqk_configure_mac(
....@@ -3728,13 +3693,13 @@
37283693 		rtl_write_dword(rtlpriv, 0xcc8, 0x20000000);
37293694 		rtl_set_bbreg(hw, 0xccc, 0x000007ff, tx_y);
37303695 		rtl_set_bbreg(hw, 0xcd4, 0x000007ff, tx_x);
3731
-		RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
3732
-			 "TX_X = %x;;TX_Y = %x =====> fill to IQC\n",
3733
-			 tx_x, tx_y);
3734
-		RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
3735
-			 "0xcd4 = %x;;0xccc = %x ====>fill to IQC\n",
3736
-			 rtl_get_bbreg(hw, 0xcd4, 0x000007ff),
3737
-			 rtl_get_bbreg(hw, 0xccc, 0x000007ff));
3696
+		rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
3697
+			"TX_X = %x;;TX_Y = %x =====> fill to IQC\n",
3698
+			tx_x, tx_y);
3699
+		rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
3700
+			"0xcd4 = %x;;0xccc = %x ====>fill to IQC\n",
3701
+			rtl_get_bbreg(hw, 0xcd4, 0x000007ff),
3702
+			rtl_get_bbreg(hw, 0xccc, 0x000007ff));
37383703 		break;
37393704 	default:
37403705 		break;
....@@ -3750,12 +3715,12 @@
37503715 		rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /* [31] = 0 --> Page C */
37513716 		rtl_set_bbreg(hw, 0xc10, 0x000003ff, rx_x>>1);
37523717 		rtl_set_bbreg(hw, 0xc10, 0x03ff0000, rx_y>>1);
3753
-		RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
3754
-			 "rx_x = %x;;rx_y = %x ====>fill to IQC\n",
3755
-			 rx_x>>1, rx_y>>1);
3756
-		RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
3757
-			 "0xc10 = %x ====>fill to IQC\n",
3758
-			 rtl_read_dword(rtlpriv, 0xc10));
3718
+		rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
3719
+			"rx_x = %x;;rx_y = %x ====>fill to IQC\n",
3720
+			rx_x >> 1, rx_y >> 1);
3721
+		rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
3722
+			"0xc10 = %x ====>fill to IQC\n",
3723
+			rtl_read_dword(rtlpriv, 0xc10));
37593724 		break;
37603725 	default:
37613726 		break;
....@@ -3780,9 +3745,9 @@
37803745 	int	i, k, vdf_y[3], vdf_x[3],
37813746 		ii, dx = 0, dy = 0, tx_finish = 0, rx_finish = 0;
37823747 
3783
-	RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
3784
-			"BandWidth = %d.\n",
3785
-			 rtlphy->current_chan_bw);
3748
+	rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
3749
+		"BandWidth = %d.\n",
3750
+		rtlphy->current_chan_bw);
37863751 	if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_80)
37873752 		vdf_enable = true;
37883753 
....@@ -3886,7 +3851,7 @@
38863851 				rtl_write_dword(rtlpriv, 0xc8c, 0x00163e96);
38873852 
38883853 			if (vdf_enable == 1) {
3889
-				RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "VDF_enable\n");
3854
+				rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "VDF_enable\n");
38903855 				for (k = 0; k <= 2; k++) {
38913856 					switch (k) {
38923857 					case 0:
....@@ -3900,9 +3865,9 @@
39003865 						rtl_set_bbreg(hw, 0xce8, BIT(31), 0x0);
39013866 						break;
39023867 					case 2:
3903
-						RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
3868
+						rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
39043869 							"vdf_y[1] = %x;;;vdf_y[0] = %x\n", vdf_y[1]>>21 & 0x00007ff, vdf_y[0]>>21 & 0x00007ff);
3905
-						RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
3870
+						rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
39063871 							"vdf_x[1] = %x;;;vdf_x[0] = %x\n", vdf_x[1]>>21 & 0x00007ff, vdf_x[0]>>21 & 0x00007ff);
39073872 						tx_dt[cal] = (vdf_y[1]>>20)-(vdf_y[0]>>20);
39083873 						tx_dt[cal] = ((16*tx_dt[cal])*10000/15708);
....@@ -4022,7 +3987,7 @@
40223987 
40233988 			if (vdf_enable == 1) {
40243989 				rtl_set_bbreg(hw, 0xce8, BIT(31), 0x0);    /* TX VDF Disable */
4025
-				RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "RXVDF Start\n");
3990
+				rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "RXVDF Start\n");
40263991 				for (k = 0; k <= 2; k++) {
40273992 					/* ====== RX mode TXK (RXK Step 1) ====== */
40283993 					rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /* [31] = 0 --> Page C */
....@@ -4059,14 +4024,17 @@
40594024 						break;
40604025 					case 2:
40614026 						{
4062
-							RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
4063
-							"VDF_Y[1] = %x;;;VDF_Y[0] = %x\n",
4064
-							vdf_y[1]>>21 & 0x00007ff, vdf_y[0]>>21 & 0x00007ff);
4065
-							RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
4066
-							"VDF_X[1] = %x;;;VDF_X[0] = %x\n",
4067
-							vdf_x[1]>>21 & 0x00007ff, vdf_x[0]>>21 & 0x00007ff);
4027
+							rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
4028
+								"VDF_Y[1] = %x;;;VDF_Y[0] = %x\n",
4029
+								vdf_y[1] >> 21 & 0x00007ff,
4030
+								vdf_y[0] >> 21 & 0x00007ff);
4031
+							rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
4032
+								"VDF_X[1] = %x;;;VDF_X[0] = %x\n",
4033
+								vdf_x[1] >> 21 & 0x00007ff,
4034
+								vdf_x[0] >> 21 & 0x00007ff);
40684035 							rx_dt[cal] = (vdf_y[1]>>20)-(vdf_y[0]>>20);
4069
-							RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "Rx_dt = %d\n", rx_dt[cal]);
4036
+							rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "Rx_dt = %d\n",
4037
+								rx_dt[cal]);
40704038 							rx_dt[cal] = ((16*rx_dt[cal])*10000/13823);
40714039 							rx_dt[cal] = (rx_dt[cal] >> 1)+(rx_dt[cal] & BIT(0));
40724040 							rtl_write_dword(rtlpriv, 0xc80, 0x18008c20);/* TX_TONE_idx[9:0], TxK_Mask[29] TX_Tone = 16 */
....@@ -4128,10 +4096,10 @@
41284096 						tx_x0_rxk[cal] = tx_x0[cal];
41294097 						tx_y0_rxk[cal] = tx_y0[cal];
41304098 						tx0iqkok = true;
4131
-						RT_TRACE(rtlpriv,
4132
-							 COMP_IQK,
4133
-							 DBG_LOUD,
4134
-							 "RXK Step 1 fail\n");
4099
+						rtl_dbg(rtlpriv,
4100
+							COMP_IQK,
4101
+							DBG_LOUD,
4102
+							"RXK Step 1 fail\n");
41354103 					}
41364104 
41374105 					/* ====== RX IQK ====== */
....@@ -4287,8 +4255,8 @@
42874255 					tx_x0_rxk[cal] = tx_x0[cal];
42884256 					tx_y0_rxk[cal] = tx_y0[cal];
42894257 					tx0iqkok = true;
4290
-					RT_TRACE(rtlpriv, COMP_IQK,
4291
-						 DBG_LOUD, "1");
4258
+					rtl_dbg(rtlpriv, COMP_IQK,
4259
+						DBG_LOUD, "1");
42924260 				}
42934261 
42944262 				/* ====== RX IQK ====== */
....@@ -4382,20 +4350,20 @@
43824350 	/* FillIQK Result */
43834351 	switch (path) {
43844352 	case RF90_PATH_A:
4385
-		RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
4386
-			 "========Path_A =======\n");
4353
+		rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
4354
+			"========Path_A =======\n");
43874355 		if (tx_average == 0)
43884356 			break;
43894357 
43904358 		for (i = 0; i < tx_average; i++) {
4391
-			RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
4392
-				 "TX_X0_RXK[%d] = %x ;; TX_Y0_RXK[%d] = %x\n", i,
4393
-				 (tx_x0_rxk[i])>>21&0x000007ff, i,
4394
-				 (tx_y0_rxk[i])>>21&0x000007ff);
4395
-			RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
4396
-				 "TX_X0[%d] = %x ;; TX_Y0[%d] = %x\n", i,
4397
-				 (tx_x0[i])>>21&0x000007ff, i,
4398
-				 (tx_y0[i])>>21&0x000007ff);
4359
+			rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
4360
+				"TX_X0_RXK[%d] = %x ;; TX_Y0_RXK[%d] = %x\n", i,
4361
+				(tx_x0_rxk[i]) >> 21 & 0x000007ff, i,
4362
+				(tx_y0_rxk[i]) >> 21 & 0x000007ff);
4363
+			rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
4364
+				"TX_X0[%d] = %x ;; TX_Y0[%d] = %x\n", i,
4365
+				(tx_x0[i]) >> 21 & 0x000007ff, i,
4366
+				(tx_y0[i]) >> 21 & 0x000007ff);
43994367 		}
44004368 		for (i = 0; i < tx_average; i++) {
44014369 			for (ii = i+1; ii < tx_average; ii++) {
....@@ -4423,7 +4391,7 @@
44234391 			break;
44244392 
44254393 		for (i = 0; i < rx_average; i++)
4426
-			RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
4394
+			rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
44274395 				"RX_X0[%d] = %x ;; RX_Y0[%d] = %x\n", i,
44284396 				(rx_x0[i])>>21&0x000007ff, i,
44294397 				(rx_y0[i])>>21&0x000007ff);
....@@ -4469,8 +4437,8 @@
44694437 
44704438 	switch (path) {
44714439 	case RF90_PATH_A:
4472
-		RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
4473
-			 "RestoreRF Path A Success!!!!\n");
4440
+		rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
4441
+			"RestoreRF Path A Success!!!!\n");
44744442 		break;
44754443 	default:
44764444 			break;
....@@ -4498,7 +4466,7 @@
44984466 	rtl_write_dword(rtlpriv, 0xcc4, 0x20040000);
44994467 	rtl_write_dword(rtlpriv, 0xcc8, 0x20000000);
45004468 	rtl_write_dword(rtlpriv, 0xcb8, 0x0);
4501
-	RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "RestoreAFE Success!!!!\n");
4469
+	rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "RestoreAFE Success!!!!\n");
45024470 }
45034471 
45044472 static void _rtl8821ae_iqk_restore_macbb(struct ieee80211_hw *hw,
....@@ -4513,7 +4481,7 @@
45134481 	/* Reload MacBB Parameters */
45144482 	for (i = 0; i < macbb_num; i++)
45154483 		rtl_write_dword(rtlpriv, backup_macbb_reg[i], macbb_backup[i]);
4516
-	RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "RestoreMacBB Success!!!!\n");
4484
+	rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "RestoreMacBB Success!!!!\n");
45174485 }
45184486 
45194487 #undef MACBB_REG_NUM
....@@ -4561,7 +4529,7 @@
45614529 	struct rtl_priv *rtlpriv = rtl_priv(hw);
45624530 	/* struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); */
45634531 	/* struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw)); */
4564
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
4532
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
45654533 
45664534 	if (main)
45674535 		rtl_set_bbreg(hw, RA_RFE_PINMUX + 4, BIT(29) | BIT(28), 0x1);
....@@ -4609,11 +4577,11 @@
46094577 	struct rtl_phy *rtlphy = &rtlpriv->phy;
46104578 	u8 i;
46114579 
4612
-	RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
4613
-		 "rtl8812ae_dm_reset_iqk_result:: settings regs %d default regs %d\n",
4614
-		 (int)(sizeof(rtlphy->iqk_matrix) /
4615
-		 sizeof(struct iqk_matrix_regs)),
4616
-		 IQK_MATRIX_SETTINGS_NUM);
4580
+	rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
4581
+		"rtl8812ae_dm_reset_iqk_result:: settings regs %d default regs %d\n",
4582
+		(int)(sizeof(rtlphy->iqk_matrix) /
4583
+		sizeof(struct iqk_matrix_regs)),
4584
+		IQK_MATRIX_SETTINGS_NUM);
46174585 
46184586 	for (i = 0; i < IQK_MATRIX_SETTINGS_NUM; i++) {
46194587 		rtlphy->iqk_matrix[i].value[0][0] = 0x100;
....@@ -4660,20 +4628,20 @@
46604628 	struct rtl_phy *rtlphy = &rtlpriv->phy;
46614629 	bool postprocessing = false;
46624630 
4663
-	RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
4664
-		 "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
4665
-		  iotype, rtlphy->set_io_inprogress);
4631
+	rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
4632
+		"-->IO Cmd(%#x), set_io_inprogress(%d)\n",
4633
+		iotype, rtlphy->set_io_inprogress);
46664634 	do {
46674635 		switch (iotype) {
46684636 		case IO_CMD_RESUME_DM_BY_SCAN:
4669
-			RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
4670
-				 "[IO CMD] Resume DM after scan.\n");
4637
+			rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
4638
+				"[IO CMD] Resume DM after scan.\n");
46714639 			postprocessing = true;
46724640 			break;
46734641 		case IO_CMD_PAUSE_BAND0_DM_BY_SCAN:
46744642 		case IO_CMD_PAUSE_BAND1_DM_BY_SCAN:
4675
-			RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
4676
-				 "[IO CMD] Pause DM before scan.\n");
4643
+			rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
4644
+				"[IO CMD] Pause DM before scan.\n");
46774645 			postprocessing = true;
46784646 			break;
46794647 		default:
....@@ -4689,7 +4657,7 @@
46894657 		return false;
46904658 	}
46914659 	rtl8821ae_phy_set_io(hw);
4692
-	RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "IO Type(%#x)\n", iotype);
4660
+	rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE, "IO Type(%#x)\n", iotype);
46934661 	return true;
46944662 }
46954663 
....@@ -4699,9 +4667,9 @@
46994667 	struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
47004668 	struct rtl_phy *rtlphy = &rtlpriv->phy;
47014669 
4702
-	RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
4703
-		 "--->Cmd(%#x), set_io_inprogress(%d)\n",
4704
-		  rtlphy->current_io_type, rtlphy->set_io_inprogress);
4670
+	rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
4671
+		"--->Cmd(%#x), set_io_inprogress(%d)\n",
4672
+		rtlphy->current_io_type, rtlphy->set_io_inprogress);
47054673 	switch (rtlphy->current_io_type) {
47064674 	case IO_CMD_RESUME_DM_BY_SCAN:
47074675 		if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_ADHOC)
....@@ -4726,8 +4694,8 @@
47264694 		break;
47274695 	}
47284696 	rtlphy->set_io_inprogress = false;
4729
-	RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
4730
-		 "(%#x)\n", rtlphy->current_io_type);
4697
+	rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
4698
+		"(%#x)\n", rtlphy->current_io_type);
47314699 }
47324700 
47334701 static void rtl8821ae_phy_set_rf_on(struct ieee80211_hw *hw)
....@@ -4761,18 +4729,17 @@
47614729 
47624730 			do {
47634731 				initializecount++;
4764
-				RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
4765
-					 "IPS Set eRf nic enable\n");
4732
+				rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
4733
+					"IPS Set eRf nic enable\n");
47664734 				rtstatus = rtl_ps_enable_nic(hw);
47674735 			} while (!rtstatus && (initializecount < 10));
47684736 			RT_CLEAR_PS_LEVEL(ppsc,
47694737 					  RT_RF_OFF_LEVL_HALT_NIC);
47704738 		} else {
4771
-			RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
4772
-				 "Set ERFON sleeped:%d ms\n",
4773
-				  jiffies_to_msecs(jiffies -
4774
-						   ppsc->
4775
-						   last_sleep_jiffies));
4739
+			rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
4740
+				"Set ERFON slept:%d ms\n",
4741
+				jiffies_to_msecs(jiffies -
4742
+						 ppsc->last_sleep_jiffies));
47764743 			ppsc->last_awake_jiffies = jiffies;
47774744 			rtl8821ae_phy_set_rf_on(hw);
47784745 		}
....@@ -4793,27 +4760,27 @@
47934760 				queue_id++;
47944761 				continue;
47954762 			} else {
4796
-				RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
4797
-					 "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
4798
-					 (i + 1), queue_id,
4799
-					 skb_queue_len(&ring->queue));
4763
+				rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
4764
+					"eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
4765
+					(i + 1), queue_id,
4766
+					skb_queue_len(&ring->queue));
48004767 
48014768 				udelay(10);
48024769 				i++;
48034770 			}
48044771 			if (i >= MAX_DOZE_WAITING_TIMES_9x) {
4805
-				RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
4806
-					 "\n ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
4807
-					  MAX_DOZE_WAITING_TIMES_9x,
4808
-					  queue_id,
4809
-					  skb_queue_len(&ring->queue));
4772
+				rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
4773
+					"\n ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
4774
+					MAX_DOZE_WAITING_TIMES_9x,
4775
+					queue_id,
4776
+					skb_queue_len(&ring->queue));
48104777 				break;
48114778 			}
48124779 		}
48134780 
48144781 		if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
4815
-			RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
4816
-				 "IPS Set eRf nic disable\n");
4782
+			rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
4783
+				"IPS Set eRf nic disable\n");
48174784 			rtl_ps_disable_nic(hw);
48184785 			RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
48194786 		} else {