forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da 
 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 
....@@ -1608,7 +1581,7 @@
16081581 }
16091582 
16101583 /* string is in decimal */
1611
-static bool _rtl8812ae_get_integer_from_string(char *str, u8 *pint)
1584
+static bool _rtl8812ae_get_integer_from_string(const char *str, u8 *pint)
16121585 {
16131586 	u16 i = 0;
16141587 	*pint = 0;
....@@ -1623,18 +1596,6 @@
16231596 		++i;
16241597 	}
16251598 
1626
-	return true;
1627
-}
1628
-
1629
-static bool _rtl8812ae_eq_n_byte(u8 *str1, u8 *str2, u32 num)
1630
-{
1631
-	if (num == 0)
1632
-		return false;
1633
-	while (num > 0) {
1634
-		num--;
1635
-		if (str1[num] != str2[num])
1636
-			return false;
1637
-	}
16381599 	return true;
16391600 }
16401601 
....@@ -1653,21 +1614,22 @@
16531614 				channel_index = i;
16541615 		}
16551616 	} else
1656
-		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "Invalid Band %d in %s\n",
1657
-			 band,  __func__);
1617
+		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD, "Invalid Band %d in %s\n",
1618
+			band,  __func__);
16581619 
16591620 	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__);
1621
+		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
1622
+			"Invalid Channel %d of Band %d in %s\n", channel,
1623
+			band, __func__);
16631624 
16641625 	return channel_index;
16651626 }
16661627 
1667
-static void _rtl8812ae_phy_set_txpower_limit(struct ieee80211_hw *hw, u8 *pregulation,
1668
-				      u8 *pband, u8 *pbandwidth,
1669
-				      u8 *prate_section, u8 *prf_path,
1670
-				      u8 *pchannel, u8 *ppower_limit)
1628
+static void _rtl8812ae_phy_set_txpower_limit(struct ieee80211_hw *hw,
1629
+				      const char *pregulation,
1630
+				      const char *pband, const char *pbandwidth,
1631
+				      const char *prate_section, const char *prf_path,
1632
+				      const char *pchannel, const char *ppower_limit)
16711633 {
16721634 	struct rtl_priv *rtlpriv = rtl_priv(hw);
16731635 	struct rtl_phy *rtlphy = &rtlpriv->phy;
....@@ -1675,53 +1637,53 @@
16751637 	u8 channel_index;
16761638 	s8 power_limit = 0, prev_power_limit, ret;
16771639 
1678
-	if (!_rtl8812ae_get_integer_from_string((char *)pchannel, &channel) ||
1679
-	    !_rtl8812ae_get_integer_from_string((char *)ppower_limit,
1640
+	if (!_rtl8812ae_get_integer_from_string(pchannel, &channel) ||
1641
+	    !_rtl8812ae_get_integer_from_string(ppower_limit,
16801642 						&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);
1643
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1644
+			"Illegal index of pwr_lmt table [chnl %d][val %d]\n",
1645
+			channel, power_limit);
16841646 	}
16851647 
16861648 	power_limit = power_limit > MAX_POWER_INDEX ?
16871649 		      MAX_POWER_INDEX : power_limit;
16881650 
1689
-	if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("FCC"), 3))
1651
+	if (strcmp(pregulation, "FCC") == 0)
16901652 		regulation = 0;
1691
-	else if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("MKK"), 3))
1653
+	else if (strcmp(pregulation, "MKK") == 0)
16921654 		regulation = 1;
1693
-	else if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("ETSI"), 4))
1655
+	else if (strcmp(pregulation, "ETSI") == 0)
16941656 		regulation = 2;
1695
-	else if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("WW13"), 4))
1657
+	else if (strcmp(pregulation, "WW13") == 0)
16961658 		regulation = 3;
16971659 
1698
-	if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("CCK"), 3))
1660
+	if (strcmp(prate_section, "CCK") == 0)
16991661 		rate_section = 0;
1700
-	else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("OFDM"), 4))
1662
+	else if (strcmp(prate_section, "OFDM") == 0)
17011663 		rate_section = 1;
1702
-	else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("HT"), 2) &&
1703
-		 _rtl8812ae_eq_n_byte(prf_path, (u8 *)("1T"), 2))
1664
+	else if (strcmp(prate_section, "HT") == 0 &&
1665
+		 strcmp(prf_path, "1T") == 0)
17041666 		rate_section = 2;
1705
-	else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("HT"), 2) &&
1706
-		 _rtl8812ae_eq_n_byte(prf_path, (u8 *)("2T"), 2))
1667
+	else if (strcmp(prate_section, "HT") == 0 &&
1668
+		 strcmp(prf_path, "2T") == 0)
17071669 		rate_section = 3;
1708
-	else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("VHT"), 3) &&
1709
-		 _rtl8812ae_eq_n_byte(prf_path, (u8 *)("1T"), 2))
1670
+	else if (strcmp(prate_section, "VHT") == 0 &&
1671
+		 strcmp(prf_path, "1T") == 0)
17101672 		rate_section = 4;
1711
-	else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("VHT"), 3) &&
1712
-		 _rtl8812ae_eq_n_byte(prf_path, (u8 *)("2T"), 2))
1673
+	else if (strcmp(prate_section, "VHT") == 0 &&
1674
+		 strcmp(prf_path, "2T") == 0)
17131675 		rate_section = 5;
17141676 
1715
-	if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("20M"), 3))
1677
+	if (strcmp(pbandwidth, "20M") == 0)
17161678 		bandwidth = 0;
1717
-	else if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("40M"), 3))
1679
+	else if (strcmp(pbandwidth, "40M") == 0)
17181680 		bandwidth = 1;
1719
-	else if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("80M"), 3))
1681
+	else if (strcmp(pbandwidth, "80M") == 0)
17201682 		bandwidth = 2;
1721
-	else if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("160M"), 4))
1683
+	else if (strcmp(pbandwidth, "160M") == 0)
17221684 		bandwidth = 3;
17231685 
1724
-	if (_rtl8812ae_eq_n_byte(pband, (u8 *)("2.4G"), 4)) {
1686
+	if (strcmp(pband, "2.4G") == 0) {
17251687 		ret = _rtl8812ae_phy_get_chnl_idx_of_txpwr_lmt(hw,
17261688 							       BAND_ON_2_4G,
17271689 							       channel);
....@@ -1740,12 +1702,12 @@
17401702 				[rate_section][channel_index][RF90_PATH_A] =
17411703 								   power_limit;
17421704 
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]
1705
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1706
+			"2.4G [regula %d][bw %d][sec %d][chnl %d][val %d]\n",
1707
+			regulation, bandwidth, rate_section, channel_index,
1708
+			rtlphy->txpwr_limit_2_4g[regulation][bandwidth]
17471709 				[rate_section][channel_index][RF90_PATH_A]);
1748
-	} else if (_rtl8812ae_eq_n_byte(pband, (u8 *)("5G"), 2)) {
1710
+	} else if (strcmp(pband, "5G") == 0) {
17491711 		ret = _rtl8812ae_phy_get_chnl_idx_of_txpwr_lmt(hw,
17501712 							       BAND_ON_5G,
17511713 							       channel);
....@@ -1763,23 +1725,23 @@
17631725 			rtlphy->txpwr_limit_5g[regulation][bandwidth]
17641726 			[rate_section][channel_index][RF90_PATH_A] = power_limit;
17651727 
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]
1728
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1729
+			"5G: [regul %d][bw %d][sec %d][chnl %d][val %d]\n",
1730
+			regulation, bandwidth, rate_section, channel,
1731
+			rtlphy->txpwr_limit_5g[regulation][bandwidth]
17701732 				[rate_section][channel_index][RF90_PATH_A]);
17711733 	} else {
1772
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1773
-			 "Cannot recognize the band info in %s\n", pband);
1734
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1735
+			"Cannot recognize the band info in %s\n", pband);
17741736 		return;
17751737 	}
17761738 }
17771739 
17781740 static void _rtl8812ae_phy_config_bb_txpwr_lmt(struct ieee80211_hw *hw,
1779
-					  u8 *regulation, u8 *band,
1780
-					  u8 *bandwidth, u8 *rate_section,
1781
-					  u8 *rf_path, u8 *channel,
1782
-					  u8 *power_limit)
1741
+					  const char *regulation, const char *band,
1742
+					  const char *bandwidth, const char *rate_section,
1743
+					  const char *rf_path, const char *channel,
1744
+					  const char *power_limit)
17831745 {
17841746 	_rtl8812ae_phy_set_txpower_limit(hw, regulation, band, bandwidth,
17851747 					 rate_section, rf_path, channel,
....@@ -1792,7 +1754,7 @@
17921754 	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
17931755 	u32 i = 0;
17941756 	u32 array_len;
1795
-	u8 **array;
1757
+	const char **array;
17961758 
17971759 	if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
17981760 		array_len = RTL8812AE_TXPWR_LMT_ARRAY_LEN;
....@@ -1802,17 +1764,16 @@
18021764 		array = RTL8821AE_TXPWR_LMT;
18031765 	}
18041766 
1805
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1806
-		 "\n");
1767
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, "\n");
18071768 
18081769 	for (i = 0; i < array_len; i += 7) {
1809
-		u8 *regulation = array[i];
1810
-		u8 *band = array[i+1];
1811
-		u8 *bandwidth = array[i+2];
1812
-		u8 *rate = array[i+3];
1813
-		u8 *rf_path = array[i+4];
1814
-		u8 *chnl = array[i+5];
1815
-		u8 *val = array[i+6];
1770
+		const char *regulation = array[i];
1771
+		const char *band = array[i+1];
1772
+		const char *bandwidth = array[i+2];
1773
+		const char *rate = array[i+3];
1774
+		const char *rf_path = array[i+4];
1775
+		const char *chnl = array[i+5];
1776
+		const char *val = array[i+6];
18161777 
18171778 		_rtl8812ae_phy_config_bb_txpwr_lmt(hw, regulation, band,
18181779 						   bandwidth, rate, rf_path,
....@@ -1835,7 +1796,7 @@
18351796 
18361797 	rtstatus = _rtl8821ae_phy_config_bb_with_headerfile(hw,
18371798 						       BASEBAND_CONFIG_PHY_REG);
1838
-	if (rtstatus != true) {
1799
+	if (!rtstatus) {
18391800 		pr_err("Write BB Reg Fail!!\n");
18401801 		return false;
18411802 	}
....@@ -1844,7 +1805,7 @@
18441805 		rtstatus = _rtl8821ae_phy_config_bb_with_pgheaderfile(hw,
18451806 						    BASEBAND_CONFIG_PHY_REG);
18461807 	}
1847
-	if (rtstatus != true) {
1808
+	if (!rtstatus) {
18481809 		pr_err("BB_PG Reg Fail!!\n");
18491810 		return false;
18501811 	}
....@@ -1858,7 +1819,7 @@
18581819 	rtstatus = _rtl8821ae_phy_config_bb_with_headerfile(hw,
18591820 						BASEBAND_CONFIG_AGC_TAB);
18601821 
1861
-	if (rtstatus != true) {
1822
+	if (!rtstatus) {
18621823 		pr_err("AGC Table Fail\n");
18631824 		return false;
18641825 	}
....@@ -1926,7 +1887,7 @@
19261887 	u32 arraylength;
19271888 	u32 *ptrarray;
19281889 
1929
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read MAC_REG_Array\n");
1890
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, "Read MAC_REG_Array\n");
19301891 	if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
19311892 		arraylength = RTL8821AE_MAC_1T_ARRAYLEN;
19321893 		ptrarray = RTL8821AE_MAC_REG_ARRAY;
....@@ -1934,8 +1895,8 @@
19341895 		arraylength = RTL8812AE_MAC_1T_ARRAYLEN;
19351896 		ptrarray = RTL8812AE_MAC_REG_ARRAY;
19361897 	}
1937
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1938
-		 "Img: MAC_REG_ARRAY LEN %d\n", arraylength);
1898
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1899
+		"Img: MAC_REG_ARRAY LEN %d\n", arraylength);
19391900 
19401901 	return __rtl8821ae_phy_config_with_headerfile(hw,
19411902 			ptrarray, arraylength, rtl_write_byte_with_val32);
....@@ -2001,22 +1962,22 @@
20011962 	u8 rate_section = _rtl8821ae_get_rate_section_index(regaddr);
20021963 
20031964 	if (band != BAND_ON_2_4G && band != BAND_ON_5G) {
2004
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid Band %d\n", band);
1965
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid Band %d\n", band);
20051966 		band = BAND_ON_2_4G;
20061967 	}
20071968 	if (rfpath >= MAX_RF_PATH) {
2008
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid RfPath %d\n", rfpath);
1969
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid RfPath %d\n", rfpath);
20091970 		rfpath = MAX_RF_PATH - 1;
20101971 	}
20111972 	if (txnum >= MAX_RF_PATH) {
2012
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid TxNum %d\n", txnum);
1973
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid TxNum %d\n", txnum);
20131974 		txnum = MAX_RF_PATH - 1;
20141975 	}
20151976 	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]);
1977
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1978
+		"TxPwrByRateOffset[Band %d][RfPath %d][TxNum %d][RateSection %d] = 0x%x\n",
1979
+		band, rfpath, txnum, rate_section,
1980
+		rtlphy->tx_power_by_rate_offset[band][rfpath][txnum][rate_section]);
20201981 }
20211982 
20221983 static bool _rtl8821ae_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
....@@ -2038,8 +1999,8 @@
20381999 	}
20392000 
20402001 	if (configtype != BASEBAND_CONFIG_PHY_REG) {
2041
-		RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
2042
-			 "configtype != BaseBand_Config_PHY_REG\n");
2002
+		rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
2003
+			"configtype != BaseBand_Config_PHY_REG\n");
20432004 		return true;
20442005 	}
20452006 	for (i = 0; i < arraylen; i += 6) {
....@@ -2097,7 +2058,6 @@
20972058 bool rtl8812ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
20982059 					     enum radio_path rfpath)
20992060 {
2100
-	bool rtstatus = true;
21012061 	u32 *radioa_array_table_a, *radioa_array_table_b;
21022062 	u16 radioa_arraylen_a, radioa_arraylen_b;
21032063 	struct rtl_priv *rtlpriv = rtl_priv(hw);
....@@ -2106,10 +2066,9 @@
21062066 	radioa_array_table_a = RTL8812AE_RADIOA_ARRAY;
21072067 	radioa_arraylen_b = RTL8812AE_RADIOB_1TARRAYLEN;
21082068 	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;
2069
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
2070
+		"Radio_A:RTL8821AE_RADIOA_ARRAY %d\n", radioa_arraylen_a);
2071
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
21132072 	switch (rfpath) {
21142073 	case RF90_PATH_A:
21152074 		return __rtl8821ae_phy_config_with_headerfile(hw,
....@@ -2132,17 +2091,15 @@
21322091 bool rtl8821ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
21332092 						enum radio_path rfpath)
21342093 {
2135
-	bool rtstatus = true;
21362094 	u32 *radioa_array_table;
21372095 	u16 radioa_arraylen;
21382096 	struct rtl_priv *rtlpriv = rtl_priv(hw);
21392097 
21402098 	radioa_arraylen = RTL8821AE_RADIOA_1TARRAYLEN;
21412099 	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;
2100
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
2101
+		"Radio_A:RTL8821AE_RADIOA_ARRAY %d\n", radioa_arraylen);
2102
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
21462103 	switch (rfpath) {
21472104 	case RF90_PATH_A:
21482105 		return __rtl8821ae_phy_config_with_headerfile(hw,
....@@ -2173,21 +2130,21 @@
21732130 	rtlphy->default_initialgain[3] =
21742131 	    (u8)rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, MASKBYTE0);
21752132 
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]);
2133
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
2134
+		"Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
2135
+		rtlphy->default_initialgain[0],
2136
+		rtlphy->default_initialgain[1],
2137
+		rtlphy->default_initialgain[2],
2138
+		rtlphy->default_initialgain[3]);
21822139 
21832140 	rtlphy->framesync = (u8)rtl_get_bbreg(hw,
21842141 					       ROFDM0_RXDETECTOR3, MASKBYTE0);
21852142 	rtlphy->framesync_c34 = rtl_get_bbreg(hw,
21862143 					      ROFDM0_RXDETECTOR2, MASKDWORD);
21872144 
2188
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
2189
-		 "Default framesync (0x%x) = 0x%x\n",
2190
-		  ROFDM0_RXDETECTOR3, rtlphy->framesync);
2145
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
2146
+		"Default framesync (0x%x) = 0x%x\n",
2147
+		ROFDM0_RXDETECTOR3, rtlphy->framesync);
21912148 }
21922149 
21932150 static void phy_init_bb_rf_register_definition(struct ieee80211_hw *hw)
....@@ -2372,7 +2329,7 @@
23722329 	struct rtl_phy *rtlphy = &rtlpriv->phy;
23732330 	short band_temp = -1, regulation = -1, bandwidth_temp = -1,
23742331 		 rate_section = -1, channel_temp = -1;
2375
-	u16 bd, regu, bdwidth, sec, chnl;
2332
+	u16 regu, bdwidth, sec, chnl;
23762333 	s8 power_limit = MAX_POWER_INDEX;
23772334 
23782335 	if (rtlefuse->eeprom_regulatory == 2)
....@@ -2454,14 +2411,14 @@
24542411 		rate_section = 5;
24552412 		break;
24562413 	default:
2457
-		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
2414
+		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
24582415 			"Wrong rate 0x%x\n", rate);
24592416 		break;
24602417 	}
24612418 
24622419 	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);
2420
+		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
2421
+			"Wrong rate 0x%x: No CCK in 5G Band\n", rate);
24652422 
24662423 	/*workaround for wrong index combination to obtain tx power limit,
24672424 	  OFDM only exists in BW 20M*/
....@@ -2486,14 +2443,13 @@
24862443 
24872444 	if (band_temp == -1 || regulation == -1 || bandwidth_temp == -1 ||
24882445 		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);
2446
+		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
2447
+			"Wrong index value to access power limit table [band %d][regulation %d][bandwidth %d][rf_path %d][rate_section %d][chnl %d]\n",
2448
+			band_temp, regulation, bandwidth_temp, rf_path,
2449
+			rate_section, channel_temp);
24932450 		return MAX_POWER_INDEX;
24942451 	}
24952452 
2496
-	bd = band_temp;
24972453 	regu = regulation;
24982454 	bdwidth = bandwidth_temp;
24992455 	sec = rate_section;
....@@ -2524,8 +2480,8 @@
25242480 			rtlphy->txpwr_limit_5g[regu][chnl]
25252481 			[sec][chnl][rf_path];
25262482 	} else {
2527
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
2528
-			 "No power limit table of the specified band\n");
2483
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
2484
+			"No power limit table of the specified band\n");
25292485 	}
25302486 	return power_limit;
25312487 }
....@@ -2633,7 +2589,7 @@
26332589 			else
26342590 				tx_pwr_diff = tx_pwr_diff > limit ? limit : tx_pwr_diff;
26352591 		}
2636
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2592
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
26372593 			"Maximum power by rate %d, final power by rate %d\n",
26382594 			limit, tx_pwr_diff);
26392595 	}
....@@ -2656,7 +2612,7 @@
26562612 	    (channel > 14 || channel < 1)) ||
26572613 	    ((rtlhal->current_bandtype == BAND_ON_5G) && (channel <= 14))) {
26582614 		index = 0;
2659
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2615
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
26602616 			"Illegal channel!!\n");
26612617 	}
26622618 
....@@ -2667,7 +2623,7 @@
26672623 		else if (DESC_RATE6M <= rate)
26682624 			txpower = rtlefuse->txpwrlevel_ht40_1s[path][index];
26692625 		else
2670
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "invalid rate\n");
2626
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "invalid rate\n");
26712627 
26722628 		if (DESC_RATE6M <= rate && rate <= DESC_RATE54M &&
26732629 		    !RTL8821AE_RX_HAL_IS_CCK_RATE(rate))
....@@ -2701,8 +2657,8 @@
27012657 		if (DESC_RATE6M <= rate)
27022658 			txpower = rtlefuse->txpwr_5g_bw40base[path][index];
27032659 		else
2704
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_WARNING,
2705
-				 "INVALID Rate.\n");
2660
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_WARNING,
2661
+				"INVALID Rate.\n");
27062662 
27072663 		if (DESC_RATE6M <= rate && rate <= DESC_RATE54M &&
27082664 		    !RTL8821AE_RX_HAL_IS_CCK_RATE(rate))
....@@ -2968,7 +2924,7 @@
29682924 				      MASKBYTE3, power_index);
29692925 			break;
29702926 		default:
2971
-			RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
2927
+			rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
29722928 				"Invalid Rate!!\n");
29732929 			break;
29742930 		}
....@@ -3167,13 +3123,13 @@
31673123 				      MASKBYTE3, power_index);
31683124 			break;
31693125 		default:
3170
-			RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
3171
-				 "Invalid Rate!!\n");
3126
+			rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
3127
+				"Invalid Rate!!\n");
31723128 			break;
31733129 		}
31743130 	} else {
3175
-		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
3176
-			 "Invalid RFPath!!\n");
3131
+		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
3132
+			"Invalid RFPath!!\n");
31773133 	}
31783134 }
31793135 
....@@ -3380,7 +3336,7 @@
33803336 		rtl_write_word(rtlpriv, REG_TRXPTCL_CTL, tmp & 0xFF7F);
33813337 		break;
33823338 	default:
3383
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, "unknown Bandwidth: 0x%x\n", bw);
3339
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING, "unknown Bandwidth: 0x%x\n", bw);
33843340 		break;
33853341 	}
33863342 }
....@@ -3431,11 +3387,11 @@
34313387 	u8 sub_chnl = 0;
34323388 	u8 l1pk_val = 0;
34333389 
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 ?
3390
+	rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE,
3391
+		"Switch to %s bandwidth\n",
3392
+		(rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
3393
+		 "20MHz" :
3394
+		 (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40 ?
34393395 		  "40MHz" : "80MHz")));
34403396 
34413397 	_rtl8821ae_phy_set_reg_bw(rtlpriv, rtlphy->current_chan_bw);
....@@ -3505,7 +3461,7 @@
35053461 	rtl8821ae_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
35063462 	rtlphy->set_bwmode_inprogress = false;
35073463 
3508
-	RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD, "\n");
3464
+	rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD, "\n");
35093465 }
35103466 
35113467 void rtl8821ae_phy_set_bw_mode(struct ieee80211_hw *hw,
....@@ -3522,8 +3478,8 @@
35223478 	if ((!is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw)))
35233479 		rtl8821ae_phy_set_bw_mode_callback(hw);
35243480 	else {
3525
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
3526
-			 "FALSE driver sleep or unload\n");
3481
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
3482
+			"FALSE driver sleep or unload\n");
35273483 		rtlphy->set_bwmode_inprogress = false;
35283484 		rtlphy->current_chan_bw = tmp_bw;
35293485 	}
....@@ -3538,8 +3494,8 @@
35383494 	u8 path;
35393495 	u32 data;
35403496 
3541
-	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
3542
-		 "switch to channel%d\n", rtlphy->current_channel);
3497
+	rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE,
3498
+		"switch to channel%d\n", rtlphy->current_channel);
35433499 	if (is_hal_stop(rtlhal))
35443500 		return;
35453501 
....@@ -3574,8 +3530,6 @@
35743530 			if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
35753531 				if (36 <= channel && channel <= 64)
35763532 					data = 0x114E9;
3577
-				else if (100 <= channel && channel <= 140)
3578
-					data = 0x110E9;
35793533 				else
35803534 					data = 0x110E9;
35813535 				rtl8821ae_phy_set_rf_reg(hw, path, RF_APK,
....@@ -3583,7 +3537,7 @@
35833537 			}
35843538 		}
35853539 	}
3586
-	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
3540
+	rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
35873541 }
35883542 
35893543 u8 rtl8821ae_phy_sw_chnl(struct ieee80211_hw *hw)
....@@ -3600,8 +3554,8 @@
36003554 		return 0;
36013555 
36023556 	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");
3557
+		rtl_dbg(rtlpriv, COMP_CHAN, DBG_LOUD,
3558
+			"sw_chnl_inprogress false driver sleep or unload\n");
36053559 		return 0;
36063560 	}
36073561 	while (rtlphy->lck_inprogress && timecount < timeout) {
....@@ -3618,30 +3572,30 @@
36183572 	if (channel == 0)
36193573 		channel = 1;
36203574 
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);
3575
+	rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE,
3576
+		"switch to channel%d, band type is %d\n",
3577
+		rtlphy->current_channel, rtlhal->current_bandtype);
36243578 
36253579 	rtl8821ae_phy_sw_chnl_callback(hw);
36263580 
36273581 	rtl8821ae_dm_clear_txpower_tracking_state(hw);
36283582 	rtl8821ae_phy_set_txpower_level(hw, rtlphy->current_channel);
36293583 
3630
-	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
3584
+	rtl_dbg(rtlpriv, COMP_SCAN, DBG_TRACE, "\n");
36313585 	rtlphy->sw_chnl_inprogress = false;
36323586 	return 1;
36333587 }
36343588 
36353589 u8 _rtl8812ae_get_right_chnl_place_for_iqk(u8 chnl)
36363590 {
3637
-	u8 channel_all[TARGET_CHNL_NUM_2G_5G_8812] = {
3591
+	static const u8 channel_all[TARGET_CHNL_NUM_2G_5G_8812] = {
36383592 		1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
36393593 		14, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54,
36403594 		56, 58, 60, 62, 64, 100, 102, 104, 106, 108,
36413595 		110, 112, 114, 116, 118, 120, 122, 124, 126,
36423596 		128, 130, 132, 134, 136, 138, 140, 149, 151,
36433597 		153, 155, 157, 159, 161, 163, 165};
3644
-	u8 place = chnl;
3598
+	u8 place;
36453599 
36463600 	if (chnl > 14) {
36473601 		for (place = 14; place < sizeof(channel_all); place++)
....@@ -3668,7 +3622,7 @@
36683622 	for (i = 0; i < mac_bb_num; i++)
36693623 		macbb_backup[i] = rtl_read_dword(rtlpriv, backup_macbb_reg[i]);
36703624 
3671
-	RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "BackupMacBB Success!!!!\n");
3625
+	rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "BackupMacBB Success!!!!\n");
36723626 }
36733627 
36743628 static void _rtl8821ae_iqk_backup_afe(struct ieee80211_hw *hw, u32 *afe_backup,
....@@ -3681,7 +3635,7 @@
36813635 	/*Save AFE Parameters */
36823636 	for (i = 0; i < afe_num; i++)
36833637 		afe_backup[i] = rtl_read_dword(rtlpriv, backup_afe_REG[i]);
3684
-	RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "BackupAFE Success!!!!\n");
3638
+	rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "BackupAFE Success!!!!\n");
36853639 }
36863640 
36873641 static void _rtl8821ae_iqk_backup_rf(struct ieee80211_hw *hw, u32 *rfa_backup,
....@@ -3699,7 +3653,7 @@
36993653 		rfb_backup[i] = rtl_get_rfreg(hw, RF90_PATH_B, backup_rf_reg[i],
37003654 					      BMASKDWORD);
37013655 	}
3702
-	RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "BackupRF Success!!!!\n");
3656
+	rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "BackupRF Success!!!!\n");
37033657 }
37043658 
37053659 static void _rtl8821ae_iqk_configure_mac(
....@@ -3728,13 +3682,13 @@
37283682 		rtl_write_dword(rtlpriv, 0xcc8, 0x20000000);
37293683 		rtl_set_bbreg(hw, 0xccc, 0x000007ff, tx_y);
37303684 		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));
3685
+		rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
3686
+			"TX_X = %x;;TX_Y = %x =====> fill to IQC\n",
3687
+			tx_x, tx_y);
3688
+		rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
3689
+			"0xcd4 = %x;;0xccc = %x ====>fill to IQC\n",
3690
+			rtl_get_bbreg(hw, 0xcd4, 0x000007ff),
3691
+			rtl_get_bbreg(hw, 0xccc, 0x000007ff));
37383692 		break;
37393693 	default:
37403694 		break;
....@@ -3750,12 +3704,12 @@
37503704 		rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /* [31] = 0 --> Page C */
37513705 		rtl_set_bbreg(hw, 0xc10, 0x000003ff, rx_x>>1);
37523706 		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));
3707
+		rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
3708
+			"rx_x = %x;;rx_y = %x ====>fill to IQC\n",
3709
+			rx_x >> 1, rx_y >> 1);
3710
+		rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
3711
+			"0xc10 = %x ====>fill to IQC\n",
3712
+			rtl_read_dword(rtlpriv, 0xc10));
37593713 		break;
37603714 	default:
37613715 		break;
....@@ -3780,9 +3734,9 @@
37803734 	int	i, k, vdf_y[3], vdf_x[3],
37813735 		ii, dx = 0, dy = 0, tx_finish = 0, rx_finish = 0;
37823736 
3783
-	RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
3784
-			"BandWidth = %d.\n",
3785
-			 rtlphy->current_chan_bw);
3737
+	rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
3738
+		"BandWidth = %d.\n",
3739
+		rtlphy->current_chan_bw);
37863740 	if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_80)
37873741 		vdf_enable = true;
37883742 
....@@ -3886,7 +3840,7 @@
38863840 				rtl_write_dword(rtlpriv, 0xc8c, 0x00163e96);
38873841 
38883842 			if (vdf_enable == 1) {
3889
-				RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "VDF_enable\n");
3843
+				rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "VDF_enable\n");
38903844 				for (k = 0; k <= 2; k++) {
38913845 					switch (k) {
38923846 					case 0:
....@@ -3900,9 +3854,9 @@
39003854 						rtl_set_bbreg(hw, 0xce8, BIT(31), 0x0);
39013855 						break;
39023856 					case 2:
3903
-						RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
3857
+						rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
39043858 							"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,
3859
+						rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
39063860 							"vdf_x[1] = %x;;;vdf_x[0] = %x\n", vdf_x[1]>>21 & 0x00007ff, vdf_x[0]>>21 & 0x00007ff);
39073861 						tx_dt[cal] = (vdf_y[1]>>20)-(vdf_y[0]>>20);
39083862 						tx_dt[cal] = ((16*tx_dt[cal])*10000/15708);
....@@ -4022,7 +3976,7 @@
40223976 
40233977 			if (vdf_enable == 1) {
40243978 				rtl_set_bbreg(hw, 0xce8, BIT(31), 0x0);    /* TX VDF Disable */
4025
-				RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "RXVDF Start\n");
3979
+				rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "RXVDF Start\n");
40263980 				for (k = 0; k <= 2; k++) {
40273981 					/* ====== RX mode TXK (RXK Step 1) ====== */
40283982 					rtl_set_bbreg(hw, 0x82c, BIT(31), 0x0); /* [31] = 0 --> Page C */
....@@ -4059,14 +4013,17 @@
40594013 						break;
40604014 					case 2:
40614015 						{
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);
4016
+							rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
4017
+								"VDF_Y[1] = %x;;;VDF_Y[0] = %x\n",
4018
+								vdf_y[1] >> 21 & 0x00007ff,
4019
+								vdf_y[0] >> 21 & 0x00007ff);
4020
+							rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
4021
+								"VDF_X[1] = %x;;;VDF_X[0] = %x\n",
4022
+								vdf_x[1] >> 21 & 0x00007ff,
4023
+								vdf_x[0] >> 21 & 0x00007ff);
40684024 							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]);
4025
+							rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "Rx_dt = %d\n",
4026
+								rx_dt[cal]);
40704027 							rx_dt[cal] = ((16*rx_dt[cal])*10000/13823);
40714028 							rx_dt[cal] = (rx_dt[cal] >> 1)+(rx_dt[cal] & BIT(0));
40724029 							rtl_write_dword(rtlpriv, 0xc80, 0x18008c20);/* TX_TONE_idx[9:0], TxK_Mask[29] TX_Tone = 16 */
....@@ -4128,10 +4085,10 @@
41284085 						tx_x0_rxk[cal] = tx_x0[cal];
41294086 						tx_y0_rxk[cal] = tx_y0[cal];
41304087 						tx0iqkok = true;
4131
-						RT_TRACE(rtlpriv,
4132
-							 COMP_IQK,
4133
-							 DBG_LOUD,
4134
-							 "RXK Step 1 fail\n");
4088
+						rtl_dbg(rtlpriv,
4089
+							COMP_IQK,
4090
+							DBG_LOUD,
4091
+							"RXK Step 1 fail\n");
41354092 					}
41364093 
41374094 					/* ====== RX IQK ====== */
....@@ -4287,8 +4244,8 @@
42874244 					tx_x0_rxk[cal] = tx_x0[cal];
42884245 					tx_y0_rxk[cal] = tx_y0[cal];
42894246 					tx0iqkok = true;
4290
-					RT_TRACE(rtlpriv, COMP_IQK,
4291
-						 DBG_LOUD, "1");
4247
+					rtl_dbg(rtlpriv, COMP_IQK,
4248
+						DBG_LOUD, "1");
42924249 				}
42934250 
42944251 				/* ====== RX IQK ====== */
....@@ -4382,20 +4339,20 @@
43824339 	/* FillIQK Result */
43834340 	switch (path) {
43844341 	case RF90_PATH_A:
4385
-		RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
4386
-			 "========Path_A =======\n");
4342
+		rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
4343
+			"========Path_A =======\n");
43874344 		if (tx_average == 0)
43884345 			break;
43894346 
43904347 		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);
4348
+			rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
4349
+				"TX_X0_RXK[%d] = %x ;; TX_Y0_RXK[%d] = %x\n", i,
4350
+				(tx_x0_rxk[i]) >> 21 & 0x000007ff, i,
4351
+				(tx_y0_rxk[i]) >> 21 & 0x000007ff);
4352
+			rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
4353
+				"TX_X0[%d] = %x ;; TX_Y0[%d] = %x\n", i,
4354
+				(tx_x0[i]) >> 21 & 0x000007ff, i,
4355
+				(tx_y0[i]) >> 21 & 0x000007ff);
43994356 		}
44004357 		for (i = 0; i < tx_average; i++) {
44014358 			for (ii = i+1; ii < tx_average; ii++) {
....@@ -4423,7 +4380,7 @@
44234380 			break;
44244381 
44254382 		for (i = 0; i < rx_average; i++)
4426
-			RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
4383
+			rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
44274384 				"RX_X0[%d] = %x ;; RX_Y0[%d] = %x\n", i,
44284385 				(rx_x0[i])>>21&0x000007ff, i,
44294386 				(rx_y0[i])>>21&0x000007ff);
....@@ -4469,8 +4426,8 @@
44694426 
44704427 	switch (path) {
44714428 	case RF90_PATH_A:
4472
-		RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD,
4473
-			 "RestoreRF Path A Success!!!!\n");
4429
+		rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
4430
+			"RestoreRF Path A Success!!!!\n");
44744431 		break;
44754432 	default:
44764433 			break;
....@@ -4498,7 +4455,7 @@
44984455 	rtl_write_dword(rtlpriv, 0xcc4, 0x20040000);
44994456 	rtl_write_dword(rtlpriv, 0xcc8, 0x20000000);
45004457 	rtl_write_dword(rtlpriv, 0xcb8, 0x0);
4501
-	RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "RestoreAFE Success!!!!\n");
4458
+	rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "RestoreAFE Success!!!!\n");
45024459 }
45034460 
45044461 static void _rtl8821ae_iqk_restore_macbb(struct ieee80211_hw *hw,
....@@ -4513,7 +4470,7 @@
45134470 	/* Reload MacBB Parameters */
45144471 	for (i = 0; i < macbb_num; i++)
45154472 		rtl_write_dword(rtlpriv, backup_macbb_reg[i], macbb_backup[i]);
4516
-	RT_TRACE(rtlpriv, COMP_IQK, DBG_LOUD, "RestoreMacBB Success!!!!\n");
4473
+	rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD, "RestoreMacBB Success!!!!\n");
45174474 }
45184475 
45194476 #undef MACBB_REG_NUM
....@@ -4561,7 +4518,7 @@
45614518 	struct rtl_priv *rtlpriv = rtl_priv(hw);
45624519 	/* struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); */
45634520 	/* struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw)); */
4564
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
4521
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
45654522 
45664523 	if (main)
45674524 		rtl_set_bbreg(hw, RA_RFE_PINMUX + 4, BIT(29) | BIT(28), 0x1);
....@@ -4609,11 +4566,11 @@
46094566 	struct rtl_phy *rtlphy = &rtlpriv->phy;
46104567 	u8 i;
46114568 
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);
4569
+	rtl_dbg(rtlpriv, COMP_IQK, DBG_LOUD,
4570
+		"rtl8812ae_dm_reset_iqk_result:: settings regs %d default regs %d\n",
4571
+		(int)(sizeof(rtlphy->iqk_matrix) /
4572
+		sizeof(struct iqk_matrix_regs)),
4573
+		IQK_MATRIX_SETTINGS_NUM);
46174574 
46184575 	for (i = 0; i < IQK_MATRIX_SETTINGS_NUM; i++) {
46194576 		rtlphy->iqk_matrix[i].value[0][0] = 0x100;
....@@ -4660,20 +4617,20 @@
46604617 	struct rtl_phy *rtlphy = &rtlpriv->phy;
46614618 	bool postprocessing = false;
46624619 
4663
-	RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
4664
-		 "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
4665
-		  iotype, rtlphy->set_io_inprogress);
4620
+	rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
4621
+		"-->IO Cmd(%#x), set_io_inprogress(%d)\n",
4622
+		iotype, rtlphy->set_io_inprogress);
46664623 	do {
46674624 		switch (iotype) {
46684625 		case IO_CMD_RESUME_DM_BY_SCAN:
4669
-			RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
4670
-				 "[IO CMD] Resume DM after scan.\n");
4626
+			rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
4627
+				"[IO CMD] Resume DM after scan.\n");
46714628 			postprocessing = true;
46724629 			break;
46734630 		case IO_CMD_PAUSE_BAND0_DM_BY_SCAN:
46744631 		case IO_CMD_PAUSE_BAND1_DM_BY_SCAN:
4675
-			RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
4676
-				 "[IO CMD] Pause DM before scan.\n");
4632
+			rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
4633
+				"[IO CMD] Pause DM before scan.\n");
46774634 			postprocessing = true;
46784635 			break;
46794636 		default:
....@@ -4689,7 +4646,7 @@
46894646 		return false;
46904647 	}
46914648 	rtl8821ae_phy_set_io(hw);
4692
-	RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "IO Type(%#x)\n", iotype);
4649
+	rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE, "IO Type(%#x)\n", iotype);
46934650 	return true;
46944651 }
46954652 
....@@ -4699,9 +4656,9 @@
46994656 	struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
47004657 	struct rtl_phy *rtlphy = &rtlpriv->phy;
47014658 
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);
4659
+	rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
4660
+		"--->Cmd(%#x), set_io_inprogress(%d)\n",
4661
+		rtlphy->current_io_type, rtlphy->set_io_inprogress);
47054662 	switch (rtlphy->current_io_type) {
47064663 	case IO_CMD_RESUME_DM_BY_SCAN:
47074664 		if (rtlpriv->mac80211.opmode == NL80211_IFTYPE_ADHOC)
....@@ -4726,8 +4683,8 @@
47264683 		break;
47274684 	}
47284685 	rtlphy->set_io_inprogress = false;
4729
-	RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
4730
-		 "(%#x)\n", rtlphy->current_io_type);
4686
+	rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
4687
+		"(%#x)\n", rtlphy->current_io_type);
47314688 }
47324689 
47334690 static void rtl8821ae_phy_set_rf_on(struct ieee80211_hw *hw)
....@@ -4761,18 +4718,17 @@
47614718 
47624719 			do {
47634720 				initializecount++;
4764
-				RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
4765
-					 "IPS Set eRf nic enable\n");
4721
+				rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
4722
+					"IPS Set eRf nic enable\n");
47664723 				rtstatus = rtl_ps_enable_nic(hw);
47674724 			} while (!rtstatus && (initializecount < 10));
47684725 			RT_CLEAR_PS_LEVEL(ppsc,
47694726 					  RT_RF_OFF_LEVL_HALT_NIC);
47704727 		} 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));
4728
+			rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
4729
+				"Set ERFON slept:%d ms\n",
4730
+				jiffies_to_msecs(jiffies -
4731
+						 ppsc->last_sleep_jiffies));
47764732 			ppsc->last_awake_jiffies = jiffies;
47774733 			rtl8821ae_phy_set_rf_on(hw);
47784734 		}
....@@ -4793,27 +4749,27 @@
47934749 				queue_id++;
47944750 				continue;
47954751 			} 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));
4752
+				rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
4753
+					"eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
4754
+					(i + 1), queue_id,
4755
+					skb_queue_len(&ring->queue));
48004756 
48014757 				udelay(10);
48024758 				i++;
48034759 			}
48044760 			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));
4761
+				rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
4762
+					"\n ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
4763
+					MAX_DOZE_WAITING_TIMES_9x,
4764
+					queue_id,
4765
+					skb_queue_len(&ring->queue));
48104766 				break;
48114767 			}
48124768 		}
48134769 
48144770 		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");
4771
+			rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
4772
+				"IPS Set eRf nic disable\n");
48174773 			rtl_ps_disable_nic(hw);
48184774 			RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
48194775 		} else {