Skip to content

Commit e703c5d

Browse files
lwfingerKalle Valo
lwfinger
authored and
Kalle Valo
committed
rtlwifi: Remove CamelCase variables from base code
There are a number of CamelCase variables remaining in the source files of modules rtl_pci, rtl_usb, and rtlwifi. The following checkpatch excettions are also fixed: for_kalle1/0001-rtlwifi-Remove-CamelCase-variables-from-base-code.patch ----------------------------------------------------------------------- CHECK: Unnecessary parentheses around 'rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i] != rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i]' torvalds#68: FILE: drivers/net/wireless/realtek/rtlwifi/efuse.c:377: + if ((rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i] != + rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i]) || + (rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i + 1] != + rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i + 1])) { CHECK: Unnecessary parentheses around 'rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i + 1] != rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i + 1]' torvalds#68: FILE: drivers/net/wireless/realtek/rtlwifi/efuse.c:377: + if ((rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i] != + rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i]) || + (rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i + 1] != + rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i + 1])) { WARNING: line over 80 characters #70: FILE: drivers/net/wireless/realtek/rtlwifi/efuse.c:379: + (rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i + 1] != CHECK: No space is necessary after a cast torvalds#186: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c:396: + status->rx_is40mhzpacket = (bool) GET_RX_DESC_BW(pdesc); CHECK: No space is necessary after a cast torvalds#208: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c:335: + stats->rx_is40mhzpacket = (bool) GET_RX_DESC_BW(pdesc); CHECK: No space is necessary after a cast torvalds#243: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c:301: + stats->rx_is40mhzpacket = (bool) GET_RX_DESC_BW(pdesc); CHECK: No space is necessary after a cast torvalds#252: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c:368: + stats.rx_is40mhzpacket = (bool) GET_RX_DESC_BW(rxdesc); CHECK: No space is necessary after a cast torvalds#265: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c:475: + stats->rx_is40mhzpacket = (bool) GET_RX_DESC_BW(pdesc); WARNING: Unnecessary space before function pointer arguments torvalds#455: FILE: drivers/net/wireless/realtek/rtlwifi/wifi.h:1462: + void (*writen_sync) (struct rtl_priv *rtlpriv, u32 addr, void *buf, WARNING: Unnecessary space before function pointer arguments torvalds#483: FILE: drivers/net/wireless/realtek/rtlwifi/wifi.h:2257: + void (*fill_fake_txdesc) (struct ieee80211_hw *hw, u8 *pdesc, Note that not all checkpatch exceptions are addressed. Those will be handled in later patches. Signed-off-by: Larry Finger <[email protected]> Signed-off-by: Kalle Valo <[email protected]>
1 parent 03f3dd3 commit e703c5d

File tree

16 files changed

+60
-60
lines changed

16 files changed

+60
-60
lines changed

‎drivers/net/wireless/realtek/rtlwifi/debug.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ enum dbgp_flag_e {
136136
FEEPROM = 11,
137137
FPWR = 12,
138138
FDM = 13,
139-
FDBGCtrl = 14,
139+
FDBGCTRL = 14,
140140
FC2H = 15,
141141
FBT = 16,
142142
FINIT = 17,

‎drivers/net/wireless/realtek/rtlwifi/efuse.c‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -365,20 +365,20 @@ bool efuse_shadow_update_chk(struct ieee80211_hw *hw)
365365
{
366366
struct rtl_priv *rtlpriv = rtl_priv(hw);
367367
struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
368-
u8 section_idx, i, Base;
368+
u8 section_idx, i, base;
369369
u16 words_need = 0, hdr_num = 0, totalbytes, efuse_used;
370370
bool wordchanged, result = true;
371371

372372
for (section_idx = 0; section_idx < 16; section_idx++) {
373-
Base = section_idx * 8;
373+
base = section_idx * 8;
374374
wordchanged = false;
375375

376376
for (i = 0; i < 8; i = i + 2) {
377-
if ((rtlefuse->efuse_map[EFUSE_INIT_MAP][Base + i] !=
378-
rtlefuse->efuse_map[EFUSE_MODIFY_MAP][Base + i]) ||
379-
(rtlefuse->efuse_map[EFUSE_INIT_MAP][Base + i + 1] !=
380-
rtlefuse->efuse_map[EFUSE_MODIFY_MAP][Base + i +
381-
1])) {
377+
if (rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i] !=
378+
rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i] ||
379+
rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i + 1] !=
380+
rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i +
381+
1]) {
382382
words_need++;
383383
wordchanged = true;
384384
}
@@ -519,7 +519,7 @@ void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw)
519519
}
520520
EXPORT_SYMBOL(rtl_efuse_shadow_map_update);
521521

522-
void efuse_force_write_vendor_Id(struct ieee80211_hw *hw)
522+
void efuse_force_write_vendor_id(struct ieee80211_hw *hw)
523523
{
524524
u8 tmpdata[8] = { 0xFF, 0xFF, 0xEC, 0x10, 0xFF, 0xFF, 0xFF, 0xFF };
525525

@@ -1111,7 +1111,7 @@ void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
11111111
struct rtl_priv *rtlpriv = rtl_priv(hw);
11121112
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
11131113
u8 tempval;
1114-
u16 tmpV16;
1114+
u16 tmpv16;
11151115

11161116
if (pwrstate && (rtlhal->hw_type != HARDWARE_TYPE_RTL8192SE)) {
11171117

@@ -1120,31 +1120,31 @@ void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
11201120
rtl_write_byte(rtlpriv,
11211121
rtlpriv->cfg->maps[EFUSE_ACCESS], 0x69);
11221122
} else {
1123-
tmpV16 =
1123+
tmpv16 =
11241124
rtl_read_word(rtlpriv,
11251125
rtlpriv->cfg->maps[SYS_ISO_CTRL]);
1126-
if (!(tmpV16 & rtlpriv->cfg->maps[EFUSE_PWC_EV12V])) {
1127-
tmpV16 |= rtlpriv->cfg->maps[EFUSE_PWC_EV12V];
1126+
if (!(tmpv16 & rtlpriv->cfg->maps[EFUSE_PWC_EV12V])) {
1127+
tmpv16 |= rtlpriv->cfg->maps[EFUSE_PWC_EV12V];
11281128
rtl_write_word(rtlpriv,
11291129
rtlpriv->cfg->maps[SYS_ISO_CTRL],
1130-
tmpV16);
1130+
tmpv16);
11311131
}
11321132
}
1133-
tmpV16 = rtl_read_word(rtlpriv,
1133+
tmpv16 = rtl_read_word(rtlpriv,
11341134
rtlpriv->cfg->maps[SYS_FUNC_EN]);
1135-
if (!(tmpV16 & rtlpriv->cfg->maps[EFUSE_FEN_ELDR])) {
1136-
tmpV16 |= rtlpriv->cfg->maps[EFUSE_FEN_ELDR];
1135+
if (!(tmpv16 & rtlpriv->cfg->maps[EFUSE_FEN_ELDR])) {
1136+
tmpv16 |= rtlpriv->cfg->maps[EFUSE_FEN_ELDR];
11371137
rtl_write_word(rtlpriv,
1138-
rtlpriv->cfg->maps[SYS_FUNC_EN], tmpV16);
1138+
rtlpriv->cfg->maps[SYS_FUNC_EN], tmpv16);
11391139
}
11401140

1141-
tmpV16 = rtl_read_word(rtlpriv, rtlpriv->cfg->maps[SYS_CLK]);
1142-
if ((!(tmpV16 & rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN])) ||
1143-
(!(tmpV16 & rtlpriv->cfg->maps[EFUSE_ANA8M]))) {
1144-
tmpV16 |= (rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN] |
1141+
tmpv16 = rtl_read_word(rtlpriv, rtlpriv->cfg->maps[SYS_CLK]);
1142+
if ((!(tmpv16 & rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN])) ||
1143+
(!(tmpv16 & rtlpriv->cfg->maps[EFUSE_ANA8M]))) {
1144+
tmpv16 |= (rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN] |
11451145
rtlpriv->cfg->maps[EFUSE_ANA8M]);
11461146
rtl_write_word(rtlpriv,
1147-
rtlpriv->cfg->maps[SYS_CLK], tmpV16);
1147+
rtlpriv->cfg->maps[SYS_CLK], tmpv16);
11481148
}
11491149
}
11501150

‎drivers/net/wireless/realtek/rtlwifi/efuse.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void efuse_shadow_write(struct ieee80211_hw *hw, u8 type,
8585
bool efuse_shadow_update(struct ieee80211_hw *hw);
8686
bool efuse_shadow_update_chk(struct ieee80211_hw *hw);
8787
void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw);
88-
void efuse_force_write_vendor_Id(struct ieee80211_hw *hw);
88+
void efuse_force_write_vendor_id(struct ieee80211_hw *hw);
8989
void efuse_re_pg_section(struct ieee80211_hw *hw, u8 section_idx);
9090
void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate);
9191
int rtl_get_hwinfo(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv,

‎drivers/net/wireless/realtek/rtlwifi/regd.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "wifi.h"
55
#include "regd.h"
66

7-
static struct country_code_to_enum_rd allCountries[] = {
7+
static struct country_code_to_enum_rd all_countries[] = {
88
{COUNTRY_CODE_FCC, "US"},
99
{COUNTRY_CODE_IC, "US"},
1010
{COUNTRY_CODE_ETSI, "EC"},
@@ -369,9 +369,9 @@ static struct country_code_to_enum_rd *_rtl_regd_find_country(u16 countrycode)
369369
{
370370
int i;
371371

372-
for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
373-
if (allCountries[i].countrycode == countrycode)
374-
return &allCountries[i];
372+
for (i = 0; i < ARRAY_SIZE(all_countries); i++) {
373+
if (all_countries[i].countrycode == countrycode)
374+
return &all_countries[i];
375375
}
376376
return NULL;
377377
}

‎drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
393393
(GET_RX_DESC_FAGGR(pdesc) == 1));
394394
if (status->packet_report_type == NORMAL_RX)
395395
status->timestamp_low = GET_RX_DESC_TSFL(pdesc);
396-
status->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
396+
status->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
397397
status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
398398

399399
status->is_cck = RTL8188_RX_HAL_IS_CCK_RATE(status->rate);
@@ -420,7 +420,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
420420
if (status->crc)
421421
rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
422422

423-
if (status->rx_is40Mhzpacket)
423+
if (status->rx_is40mhzpacket)
424424
rx_status->bw = RATE_INFO_BW_40;
425425

426426
if (status->is_ht)

‎drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
332332
stats->isfirst_ampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1)
333333
&& (GET_RX_DESC_FAGGR(pdesc) == 1));
334334
stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);
335-
stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
335+
stats->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
336336
stats->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
337337

338338
stats->is_cck = RX_HAL_IS_CCK_RATE(pdesc->rxmcs);
@@ -346,7 +346,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
346346
if (stats->crc)
347347
rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
348348

349-
if (stats->rx_is40Mhzpacket)
349+
if (stats->rx_is40mhzpacket)
350350
rx_status->bw = RATE_INFO_BW_40;
351351

352352
if (stats->is_ht)

‎drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1331,7 +1331,7 @@ void rtl92cu_card_disable(struct ieee80211_hw *hw)
13311331
_rtl92cu_set_media_status(hw, opmode);
13321332
rtlpriv->cfg->ops->led_control(hw, LED_CTL_POWER_OFF);
13331333
RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
1334-
if (rtlusb->disableHWSM)
1334+
if (rtlusb->disablehwsm)
13351335
_CardDisableHWSM(hw);
13361336
else
13371337
_CardDisableWithoutHWSM(hw);

‎drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw,
298298
stats->isfirst_ampdu = (bool)((GET_RX_DESC_PAGGR(pdesc) == 1)
299299
&& (GET_RX_DESC_FAGGR(pdesc) == 1));
300300
stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);
301-
stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
301+
stats->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
302302
stats->is_ht = (bool)GET_RX_DESC_RX_HT(pdesc);
303303
rx_status->freq = hw->conf.chandef.chan->center_freq;
304304
rx_status->band = hw->conf.chandef.chan->band;
@@ -365,7 +365,7 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb)
365365
stats.isampdu = (bool) ((GET_RX_DESC_PAGGR(rxdesc) == 1)
366366
&& (GET_RX_DESC_FAGGR(rxdesc) == 1));
367367
stats.timestamp_low = GET_RX_DESC_TSFL(rxdesc);
368-
stats.rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(rxdesc);
368+
stats.rx_is40mhzpacket = (bool)GET_RX_DESC_BW(rxdesc);
369369
stats.is_ht = (bool)GET_RX_DESC_RX_HT(rxdesc);
370370
/* TODO: is center_freq changed when doing scan? */
371371
/* TODO: Shall we add protection or just skip those two step? */

‎drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ bool rtl92de_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
472472
stats->isfirst_ampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1)
473473
&& (GET_RX_DESC_FAGGR(pdesc) == 1));
474474
stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);
475-
stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
475+
stats->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
476476
stats->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
477477
rx_status->freq = hw->conf.chandef.chan->center_freq;
478478
rx_status->band = hw->conf.chandef.chan->band;

‎drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ bool rtl92ee_rx_query_desc(struct ieee80211_hw *hw,
371371
if (status->crc)
372372
rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
373373

374-
if (status->rx_is40Mhzpacket)
374+
if (status->rx_is40mhzpacket)
375375
rx_status->bw = RATE_INFO_BW_40;
376376

377377
if (status->is_ht)

0 commit comments

Comments
 (0)