Skip to content

Commit f7dcf2c

Browse files
lwfingerintel-lab-lkp
authored andcommitted
rtlwifi: rtl8723{be,ae}: Remove CamelCase variables
If a macro is in CamelCase, it it converted to upper case. Variables and routine names are converted to lower case. Signed-off-by: Larry Finger <[email protected]>
1 parent 2c37c8b commit f7dcf2c

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
#define IS_VENDOR_8723A_B_CUT(version) ((IS_8723_SERIES(version))\
117117
? ((GET_CVID_CUT_VERSION(version) == \
118118
B_CUT_VERSION) ? true : false) : false)
119-
#define IS_81xxC_VENDOR_UMC_B_CUT(version) ((IS_CHIP_VENDOR_UMC(version))\
119+
#define IS_81XXC_VENDOR_UMC_B_CUT(version) ((IS_CHIP_VENDOR_UMC(version))\
120120
? ((GET_CVID_CUT_VERSION(version) == \
121121
B_CUT_VERSION) ? true : false) : false)
122122

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ static bool _rtl8712e_init_mac(struct ieee80211_hw *hw)
698698

699699
/* HW Power on sequence */
700700
if (!rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
701-
PWR_INTF_PCI_MSK, Rtl8723_NIC_ENABLE_FLOW))
701+
PWR_INTF_PCI_MSK, RTL8723_NIC_ENABLE_FLOW))
702702
return false;
703703

704704
bytetmp = rtl_read_byte(rtlpriv, REG_PCIE_CTRL_REG+2);
@@ -988,7 +988,7 @@ int rtl8723e_hw_init(struct ieee80211_hw *hw)
988988
if (IS_VENDOR_UMC_A_CUT(rtlhal->version)) {
989989
rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G1, MASKDWORD, 0x30255);
990990
rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G2, MASKDWORD, 0x50a00);
991-
} else if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version)) {
991+
} else if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version)) {
992992
rtl_set_rfreg(hw, RF90_PATH_A, 0x0C, MASKDWORD, 0x894AE);
993993
rtl_set_rfreg(hw, RF90_PATH_A, 0x0A, MASKDWORD, 0x1AF31);
994994
rtl_set_rfreg(hw, RF90_PATH_A, RF_IPA, MASKDWORD, 0x8F425);
@@ -1284,7 +1284,7 @@ static void _rtl8723e_poweroff_adapter(struct ieee80211_hw *hw)
12841284
/* Combo (PCIe + USB) Card and PCIe-MF Card */
12851285
/* 1. Run LPS WL RFOFF flow */
12861286
rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
1287-
PWR_INTF_PCI_MSK, Rtl8723_NIC_LPS_ENTER_FLOW);
1287+
PWR_INTF_PCI_MSK, RTL8723_NIC_LPS_ENTER_FLOW);
12881288

12891289
/* 2. 0x1F[7:0] = 0 */
12901290
/* turn off RF */
@@ -1304,7 +1304,7 @@ static void _rtl8723e_poweroff_adapter(struct ieee80211_hw *hw)
13041304

13051305
/* HW card disable configuration. */
13061306
rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
1307-
PWR_INTF_PCI_MSK, Rtl8723_NIC_DISABLE_FLOW);
1307+
PWR_INTF_PCI_MSK, RTL8723_NIC_DISABLE_FLOW);
13081308

13091309
/* Reset MCU IO Wrapper */
13101310
u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@ static void _rtl8723e_phy_sw_rf_seting(struct ieee80211_hw *hw, u8 channel)
905905
struct rtl_phy *rtlphy = &rtlpriv->phy;
906906
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
907907

908-
if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version)) {
908+
if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version)) {
909909
if (channel == 6 && rtlphy->current_chan_bw ==
910910
HT_CHANNEL_WIDTH_20)
911911
rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G1,

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#define MAX_STALL_TIME 50
4949
#define ANTENNADIVERSITYVALUE 0x80
5050
#define MAX_TXPWR_IDX_NMODE_92S 63
51-
#define Reset_Cnt_Limit 3
51+
#define reset_cnt_limit 3
5252

5353
#define IQK_ADDA_REG_NUM 16
5454
#define IQK_MAC_REG_NUM 4

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -327,14 +327,14 @@ extern struct wlan_pwr_cfg rtl8723A_leave_lps_flow
327327
[RTL8723A_TRANS_LPS_TO_ACT_STEPS + RTL8723A_TRANS_END_STEPS];
328328

329329
/* RTL8723 Power Configuration CMDs for PCIe interface */
330-
#define Rtl8723_NIC_PWR_ON_FLOW rtl8723A_power_on_flow
331-
#define Rtl8723_NIC_RF_OFF_FLOW rtl8723A_radio_off_flow
332-
#define Rtl8723_NIC_DISABLE_FLOW rtl8723A_card_disable_flow
333-
#define Rtl8723_NIC_ENABLE_FLOW rtl8723A_card_enable_flow
334-
#define Rtl8723_NIC_SUSPEND_FLOW rtl8723A_suspend_flow
335-
#define Rtl8723_NIC_RESUME_FLOW rtl8723A_resume_flow
336-
#define Rtl8723_NIC_PDN_FLOW rtl8723A_hwpdn_flow
337-
#define Rtl8723_NIC_LPS_ENTER_FLOW rtl8723A_enter_lps_flow
338-
#define Rtl8723_NIC_LPS_LEAVE_FLOW rtl8723A_leave_lps_flow
330+
#define RTL8723_NIC_PWR_ON_FLOW rtl8723A_power_on_flow
331+
#define RTL8723_NIC_RF_OFF_FLOW rtl8723A_radio_off_flow
332+
#define RTL8723_NIC_DISABLE_FLOW rtl8723A_card_disable_flow
333+
#define RTL8723_NIC_ENABLE_FLOW rtl8723A_card_enable_flow
334+
#define RTL8723_NIC_SUSPEND_FLOW rtl8723A_suspend_flow
335+
#define RTL8723_NIC_RESUME_FLOW rtl8723A_resume_flow
336+
#define RTL8723_NIC_PDN_FLOW rtl8723A_hwpdn_flow
337+
#define RTL8723_NIC_LPS_ENTER_FLOW rtl8723A_enter_lps_flow
338+
#define RTL8723_NIC_LPS_LEAVE_FLOW rtl8723A_leave_lps_flow
339339

340340
#endif

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ int rtl8723e_init_sw_vars(struct ieee80211_hw *hw)
175175
return 1;
176176
}
177177

178-
if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version))
178+
if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version))
179179
fw_name = "rtlwifi/rtl8723fw_B.bin";
180180

181181
rtlpriv->max_fw_size = 0x6000;

drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -319,12 +319,12 @@ void rtl8723be_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
319319
*((enum rf_pwrstate *)(val)) = ppsc->rfpwr_state;
320320
break;
321321
case HW_VAR_FWLPS_RF_ON:{
322-
enum rf_pwrstate rfState;
322+
enum rf_pwrstate rfstate;
323323
u32 val_rcr;
324324

325325
rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RF_STATE,
326-
(u8 *)(&rfState));
327-
if (rfState == ERFOFF) {
326+
(u8 *)(&rfstate));
327+
if (rfstate == ERFOFF) {
328328
*((bool *)(val)) = true;
329329
} else {
330330
val_rcr = rtl_read_dword(rtlpriv, REG_RCR);
@@ -764,10 +764,10 @@ static bool _rtl8723be_llt_table_init(struct ieee80211_hw *hw)
764764
struct rtl_priv *rtlpriv = rtl_priv(hw);
765765
unsigned short i;
766766
u8 txpktbuf_bndy;
767-
u8 maxPage;
767+
u8 maxpage;
768768
bool status;
769769

770-
maxPage = 255;
770+
maxpage = 255;
771771
txpktbuf_bndy = 245;
772772

773773
rtl_write_dword(rtlpriv, REG_TRXFF_BNDY,
@@ -792,13 +792,13 @@ static bool _rtl8723be_llt_table_init(struct ieee80211_hw *hw)
792792
if (!status)
793793
return status;
794794

795-
for (i = txpktbuf_bndy; i < maxPage; i++) {
795+
for (i = txpktbuf_bndy; i < maxpage; i++) {
796796
status = _rtl8723be_llt_write(hw, i, (i + 1));
797797
if (!status)
798798
return status;
799799
}
800800

801-
status = _rtl8723be_llt_write(hw, maxPage, txpktbuf_bndy);
801+
status = _rtl8723be_llt_write(hw, maxpage, txpktbuf_bndy);
802802
if (!status)
803803
return status;
804804

0 commit comments

Comments
 (0)