Skip to content

Commit ae1dd42

Browse files
lwfingerintel-lab-lkp
lwfinger
authored and
intel-lab-lkp
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]>
1 parent 34025a1 commit ae1dd42

File tree

16 files changed

+60
-60
lines changed

16 files changed

+60
-60
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ enum dbgp_flag_e {
157157
FEEPROM = 11,
158158
FPWR = 12,
159159
FDM = 13,
160-
FDBGCtrl = 14,
160+
FDBGCTRL = 14,
161161
FC2H = 15,
162162
FBT = 16,
163163
FINIT = 17,

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

+22-22
Original file line numberDiff line numberDiff line change
@@ -386,20 +386,20 @@ bool efuse_shadow_update_chk(struct ieee80211_hw *hw)
386386
{
387387
struct rtl_priv *rtlpriv = rtl_priv(hw);
388388
struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
389-
u8 section_idx, i, Base;
389+
u8 section_idx, i, base;
390390
u16 words_need = 0, hdr_num = 0, totalbytes, efuse_used;
391391
bool wordchanged, result = true;
392392

393393
for (section_idx = 0; section_idx < 16; section_idx++) {
394-
Base = section_idx * 8;
394+
base = section_idx * 8;
395395
wordchanged = false;
396396

397397
for (i = 0; i < 8; i = i + 2) {
398-
if ((rtlefuse->efuse_map[EFUSE_INIT_MAP][Base + i] !=
399-
rtlefuse->efuse_map[EFUSE_MODIFY_MAP][Base + i]) ||
400-
(rtlefuse->efuse_map[EFUSE_INIT_MAP][Base + i + 1] !=
401-
rtlefuse->efuse_map[EFUSE_MODIFY_MAP][Base + i +
402-
1])) {
398+
if (rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i] !=
399+
rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i] ||
400+
rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i + 1] !=
401+
rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i +
402+
1]) {
403403
words_need++;
404404
wordchanged = true;
405405
}
@@ -540,7 +540,7 @@ void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw)
540540
}
541541
EXPORT_SYMBOL(rtl_efuse_shadow_map_update);
542542

543-
void efuse_force_write_vendor_Id(struct ieee80211_hw *hw)
543+
void efuse_force_write_vendor_id(struct ieee80211_hw *hw)
544544
{
545545
u8 tmpdata[8] = { 0xFF, 0xFF, 0xEC, 0x10, 0xFF, 0xFF, 0xFF, 0xFF };
546546

@@ -1132,7 +1132,7 @@ void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
11321132
struct rtl_priv *rtlpriv = rtl_priv(hw);
11331133
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
11341134
u8 tempval;
1135-
u16 tmpV16;
1135+
u16 tmpv16;
11361136

11371137
if (pwrstate && (rtlhal->hw_type != HARDWARE_TYPE_RTL8192SE)) {
11381138

@@ -1141,31 +1141,31 @@ void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
11411141
rtl_write_byte(rtlpriv,
11421142
rtlpriv->cfg->maps[EFUSE_ACCESS], 0x69);
11431143
} else {
1144-
tmpV16 =
1144+
tmpv16 =
11451145
rtl_read_word(rtlpriv,
11461146
rtlpriv->cfg->maps[SYS_ISO_CTRL]);
1147-
if (!(tmpV16 & rtlpriv->cfg->maps[EFUSE_PWC_EV12V])) {
1148-
tmpV16 |= rtlpriv->cfg->maps[EFUSE_PWC_EV12V];
1147+
if (!(tmpv16 & rtlpriv->cfg->maps[EFUSE_PWC_EV12V])) {
1148+
tmpv16 |= rtlpriv->cfg->maps[EFUSE_PWC_EV12V];
11491149
rtl_write_word(rtlpriv,
11501150
rtlpriv->cfg->maps[SYS_ISO_CTRL],
1151-
tmpV16);
1151+
tmpv16);
11521152
}
11531153
}
1154-
tmpV16 = rtl_read_word(rtlpriv,
1154+
tmpv16 = rtl_read_word(rtlpriv,
11551155
rtlpriv->cfg->maps[SYS_FUNC_EN]);
1156-
if (!(tmpV16 & rtlpriv->cfg->maps[EFUSE_FEN_ELDR])) {
1157-
tmpV16 |= rtlpriv->cfg->maps[EFUSE_FEN_ELDR];
1156+
if (!(tmpv16 & rtlpriv->cfg->maps[EFUSE_FEN_ELDR])) {
1157+
tmpv16 |= rtlpriv->cfg->maps[EFUSE_FEN_ELDR];
11581158
rtl_write_word(rtlpriv,
1159-
rtlpriv->cfg->maps[SYS_FUNC_EN], tmpV16);
1159+
rtlpriv->cfg->maps[SYS_FUNC_EN], tmpv16);
11601160
}
11611161

1162-
tmpV16 = rtl_read_word(rtlpriv, rtlpriv->cfg->maps[SYS_CLK]);
1163-
if ((!(tmpV16 & rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN])) ||
1164-
(!(tmpV16 & rtlpriv->cfg->maps[EFUSE_ANA8M]))) {
1165-
tmpV16 |= (rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN] |
1162+
tmpv16 = rtl_read_word(rtlpriv, rtlpriv->cfg->maps[SYS_CLK]);
1163+
if ((!(tmpv16 & rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN])) ||
1164+
(!(tmpv16 & rtlpriv->cfg->maps[EFUSE_ANA8M]))) {
1165+
tmpv16 |= (rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN] |
11661166
rtlpriv->cfg->maps[EFUSE_ANA8M]);
11671167
rtl_write_word(rtlpriv,
1168-
rtlpriv->cfg->maps[SYS_CLK], tmpV16);
1168+
rtlpriv->cfg->maps[SYS_CLK], tmpv16);
11691169
}
11701170
}
11711171

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void efuse_shadow_write(struct ieee80211_hw *hw, u8 type,
107107
bool efuse_shadow_update(struct ieee80211_hw *hw);
108108
bool efuse_shadow_update_chk(struct ieee80211_hw *hw);
109109
void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw);
110-
void efuse_force_write_vendor_Id(struct ieee80211_hw *hw);
110+
void efuse_force_write_vendor_id(struct ieee80211_hw *hw);
111111
void efuse_re_pg_section(struct ieee80211_hw *hw, u8 section_idx);
112112
void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate);
113113
int rtl_get_hwinfo(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv,

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "wifi.h"
2727
#include "regd.h"
2828

29-
static struct country_code_to_enum_rd allCountries[] = {
29+
static struct country_code_to_enum_rd all_countries[] = {
3030
{COUNTRY_CODE_FCC, "US"},
3131
{COUNTRY_CODE_IC, "US"},
3232
{COUNTRY_CODE_ETSI, "EC"},
@@ -391,9 +391,9 @@ static struct country_code_to_enum_rd *_rtl_regd_find_country(u16 countrycode)
391391
{
392392
int i;
393393

394-
for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
395-
if (allCountries[i].countrycode == countrycode)
396-
return &allCountries[i];
394+
for (i = 0; i < ARRAY_SIZE(all_countries); i++) {
395+
if (all_countries[i].countrycode == countrycode)
396+
return &all_countries[i];
397397
}
398398
return NULL;
399399
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
415415
(GET_RX_DESC_FAGGR(pdesc) == 1));
416416
if (status->packet_report_type == NORMAL_RX)
417417
status->timestamp_low = GET_RX_DESC_TSFL(pdesc);
418-
status->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
418+
status->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
419419
status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
420420

421421
status->is_cck = RTL8188_RX_HAL_IS_CCK_RATE(status->rate);
@@ -442,7 +442,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
442442
if (status->crc)
443443
rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
444444

445-
if (status->rx_is40Mhzpacket)
445+
if (status->rx_is40mhzpacket)
446446
rx_status->bw = RATE_INFO_BW_40;
447447

448448
if (status->is_ht)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
354354
stats->isfirst_ampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1)
355355
&& (GET_RX_DESC_FAGGR(pdesc) == 1));
356356
stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);
357-
stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
357+
stats->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
358358
stats->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
359359

360360
stats->is_cck = RX_HAL_IS_CCK_RATE(pdesc->rxmcs);
@@ -368,7 +368,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
368368
if (stats->crc)
369369
rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
370370

371-
if (stats->rx_is40Mhzpacket)
371+
if (stats->rx_is40mhzpacket)
372372
rx_status->bw = RATE_INFO_BW_40;
373373

374374
if (stats->is_ht)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1353,7 +1353,7 @@ void rtl92cu_card_disable(struct ieee80211_hw *hw)
13531353
_rtl92cu_set_media_status(hw, opmode);
13541354
rtlpriv->cfg->ops->led_control(hw, LED_CTL_POWER_OFF);
13551355
RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
1356-
if (rtlusb->disableHWSM)
1356+
if (rtlusb->disablehwsm)
13571357
_CardDisableHWSM(hw);
13581358
else
13591359
_CardDisableWithoutHWSM(hw);

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw,
320320
stats->isfirst_ampdu = (bool)((GET_RX_DESC_PAGGR(pdesc) == 1)
321321
&& (GET_RX_DESC_FAGGR(pdesc) == 1));
322322
stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);
323-
stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
323+
stats->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
324324
stats->is_ht = (bool)GET_RX_DESC_RX_HT(pdesc);
325325
rx_status->freq = hw->conf.chandef.chan->center_freq;
326326
rx_status->band = hw->conf.chandef.chan->band;
@@ -387,7 +387,7 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb)
387387
stats.isampdu = (bool) ((GET_RX_DESC_PAGGR(rxdesc) == 1)
388388
&& (GET_RX_DESC_FAGGR(rxdesc) == 1));
389389
stats.timestamp_low = GET_RX_DESC_TSFL(rxdesc);
390-
stats.rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(rxdesc);
390+
stats.rx_is40mhzpacket = (bool)GET_RX_DESC_BW(rxdesc);
391391
stats.is_ht = (bool)GET_RX_DESC_RX_HT(rxdesc);
392392
/* TODO: is center_freq changed when doing scan? */
393393
/* TODO: Shall we add protection or just skip those two step? */

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ bool rtl92de_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
494494
stats->isfirst_ampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1)
495495
&& (GET_RX_DESC_FAGGR(pdesc) == 1));
496496
stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);
497-
stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
497+
stats->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
498498
stats->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
499499
rx_status->freq = hw->conf.chandef.chan->center_freq;
500500
rx_status->band = hw->conf.chandef.chan->band;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ bool rtl92ee_rx_query_desc(struct ieee80211_hw *hw,
393393
if (status->crc)
394394
rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
395395

396-
if (status->rx_is40Mhzpacket)
396+
if (status->rx_is40mhzpacket)
397397
rx_status->bw = RATE_INFO_BW_40;
398398

399399
if (status->is_ht)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
275275
stats->isfirst_ampdu = (bool) ((GET_RX_STATUS_DESC_PAGGR(pdesc) == 1)
276276
&& (GET_RX_STATUS_DESC_FAGGR(pdesc) == 1));
277277
stats->timestamp_low = GET_RX_STATUS_DESC_TSFL(pdesc);
278-
stats->rx_is40Mhzpacket = (bool)GET_RX_STATUS_DESC_BW(pdesc);
278+
stats->rx_is40mhzpacket = (bool)GET_RX_STATUS_DESC_BW(pdesc);
279279
stats->is_ht = (bool)GET_RX_STATUS_DESC_RX_HT(pdesc);
280280
stats->is_cck = SE_RX_HAL_IS_CCK_RATE(pdesc);
281281

@@ -288,7 +288,7 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
288288
if (stats->crc)
289289
rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
290290

291-
if (stats->rx_is40Mhzpacket)
291+
if (stats->rx_is40mhzpacket)
292292
rx_status->bw = RATE_INFO_BW_40;
293293

294294
if (stats->is_ht)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ bool rtl8723e_rx_query_desc(struct ieee80211_hw *hw,
302302
status->isfirst_ampdu = (bool)((GET_RX_DESC_PAGGR(pdesc) == 1) &&
303303
(GET_RX_DESC_FAGGR(pdesc) == 1));
304304
status->timestamp_low = GET_RX_DESC_TSFL(pdesc);
305-
status->rx_is40Mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
305+
status->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
306306
status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
307307

308308
status->is_cck = RX_HAL_IS_CCK_RATE(status->rate);
@@ -316,7 +316,7 @@ bool rtl8723e_rx_query_desc(struct ieee80211_hw *hw,
316316
if (status->crc)
317317
rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
318318

319-
if (status->rx_is40Mhzpacket)
319+
if (status->rx_is40mhzpacket)
320320
rx_status->bw = RATE_INFO_BW_40;
321321

322322
if (status->is_ht)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw,
338338
status->isampdu = (bool)(GET_RX_DESC_PAGGR(pdesc) == 1);
339339
status->isfirst_ampdu = (bool)(GET_RX_DESC_PAGGR(pdesc) == 1);
340340
status->timestamp_low = GET_RX_DESC_TSFL(pdesc);
341-
status->rx_is40Mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
341+
status->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
342342
status->bandwidth = (u8)GET_RX_DESC_BW(pdesc);
343343
status->macid = GET_RX_DESC_MACID(pdesc);
344344
status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
@@ -372,7 +372,7 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw,
372372
if (status->crc)
373373
rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
374374

375-
if (status->rx_is40Mhzpacket)
375+
if (status->rx_is40mhzpacket)
376376
rx_status->bw = RATE_INFO_BW_40;
377377

378378
if (status->is_ht)

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ static void _usb_write32_async(struct rtl_priv *rtlpriv, u32 addr, u32 val)
214214
_usb_write_async(to_usb_device(dev), addr, val, 4);
215215
}
216216

217-
static void _usb_writeN_sync(struct rtl_priv *rtlpriv, u32 addr, void *data,
217+
static void _usb_writen_sync(struct rtl_priv *rtlpriv, u32 addr, void *data,
218218
u16 len)
219219
{
220220
struct device *dev = rtlpriv->io.dev;
@@ -249,7 +249,7 @@ static void _rtl_usb_io_handler_init(struct device *dev,
249249
rtlpriv->io.read8_sync = _usb_read8_sync;
250250
rtlpriv->io.read16_sync = _usb_read16_sync;
251251
rtlpriv->io.read32_sync = _usb_read32_sync;
252-
rtlpriv->io.writeN_sync = _usb_writeN_sync;
252+
rtlpriv->io.writen_sync = _usb_writen_sync;
253253
}
254254

255255
static void _rtl_usb_io_handler_release(struct ieee80211_hw *hw)
@@ -413,7 +413,7 @@ static void rtl_usb_init_sw(struct ieee80211_hw *hw)
413413
rtlusb->irq_mask[0] = 0xFFFFFFFF;
414414
/* HIMR_EX - turn all on */
415415
rtlusb->irq_mask[1] = 0xFFFFFFFF;
416-
rtlusb->disableHWSM = true;
416+
rtlusb->disablehwsm = true;
417417
}
418418

419419
static void _rtl_rx_completed(struct urb *urb);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ struct rtl_usb {
104104
/* Bcn control register setting */
105105
u32 reg_bcn_ctrl_val;
106106
/* for 88/92cu card disable */
107-
u8 disableHWSM;
107+
u8 disablehwsm;
108108
/*QOS & EDCA */
109109
enum acm_method acm_method;
110110
/* irq . HIMR,HIMR_EX */

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

+13-13
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ struct rtlwifi_firmware_header {
263263
u8 date;
264264
u8 hour;
265265
u8 minute;
266-
__le16 ramcodeSize;
266+
__le16 ramcodesize;
267267
__le16 rsvd2;
268268
__le32 svnindex;
269269
__le32 rsvd3;
@@ -465,11 +465,11 @@ enum hw_variables {
465465
HW_VAR_MCS_RATE_AVAILABLE = 0x1f,
466466
HW_VAR_AC_PARAM = 0x20,
467467
HW_VAR_ACM_CTRL = 0x21,
468-
HW_VAR_DIS_Req_Qsize = 0x22,
468+
HW_VAR_DIS_REQ_QSIZE = 0x22,
469469
HW_VAR_CCX_CHNL_LOAD = 0x23,
470470
HW_VAR_CCX_NOISE_HISTOGRAM = 0x24,
471471
HW_VAR_CCX_CLM_NHM = 0x25,
472-
HW_VAR_TxOPLimit = 0x26,
472+
HW_VAR_TXOPLIMIT = 0x26,
473473
HW_VAR_TURBO_MODE = 0x27,
474474
HW_VAR_RF_STATE = 0x28,
475475
HW_VAR_RF_OFF_BY_HW = 0x29,
@@ -522,7 +522,7 @@ enum hw_variables {
522522
HW_VAR_BCN_VALID = 0x55,
523523
HW_VAR_FWLPS_RF_ON = 0x56,
524524
HW_VAR_DUAL_TSF_RST = 0x57,
525-
HW_VAR_SWITCH_EPHY_WoWLAN = 0x58,
525+
HW_VAR_SWITCH_EPHY_WOWLAN = 0x58,
526526
HW_VAR_INT_MIGRATION = 0x59,
527527
HW_VAR_INT_AC = 0x5a,
528528
HW_VAR_RF_TIMING = 0x5b,
@@ -814,8 +814,8 @@ enum _fw_ps_mode {
814814
FW_PS_UAPSD_MODE = 6,
815815
FW_PS_IBSS_MODE = 7,
816816
FW_PS_WWLAN_MODE = 8,
817-
FW_PS_PM_Radio_Off = 9,
818-
FW_PS_PM_Card_Disable = 10,
817+
FW_PS_PM_RADIO_OFF = 9,
818+
FW_PS_PM_CARD_DISABLE = 10,
819819
};
820820

821821
enum rt_psmode {
@@ -849,8 +849,8 @@ enum rtl_led_pin {
849849
/*QoS related.*/
850850
/*acm implementation method.*/
851851
enum acm_method {
852-
eAcmWay0_SwAndHw = 0,
853-
eAcmWay1_HW = 1,
852+
EACMWAY0_SWANDHW = 0,
853+
EACMWAY1_HW = 1,
854854
EACMWAY2_SW = 2,
855855
};
856856

@@ -1481,7 +1481,7 @@ struct rtl_io {
14811481
void (*write8_async) (struct rtl_priv *rtlpriv, u32 addr, u8 val);
14821482
void (*write16_async) (struct rtl_priv *rtlpriv, u32 addr, u16 val);
14831483
void (*write32_async) (struct rtl_priv *rtlpriv, u32 addr, u32 val);
1484-
void (*writeN_sync) (struct rtl_priv *rtlpriv, u32 addr, void *buf,
1484+
void (*writen_sync)(struct rtl_priv *rtlpriv, u32 addr, void *buf,
14851485
u16 len);
14861486

14871487
u8(*read8_sync) (struct rtl_priv *rtlpriv, u32 addr);
@@ -1898,7 +1898,7 @@ struct rtl_dm {
18981898

18991899
struct rtl_efuse {
19001900
const struct rtl_efuse_ops *efuse_ops;
1901-
bool autoLoad_ok;
1901+
bool autoload_ok;
19021902
bool bootfromefuse;
19031903
u16 max_physical_size;
19041904

@@ -2125,7 +2125,7 @@ struct rtl_stats {
21252125
u8 rx_bufshift;
21262126
bool isampdu;
21272127
bool isfirst_ampdu;
2128-
bool rx_is40Mhzpacket;
2128+
bool rx_is40mhzpacket;
21292129
u8 rx_packet_bw;
21302130
u32 rx_pwdb_all;
21312131
u8 rx_mimo_signalstrength[4]; /*in 0~100 index */
@@ -2276,8 +2276,8 @@ struct rtl_hal_ops {
22762276
struct ieee80211_sta *sta,
22772277
struct sk_buff *skb, u8 hw_queue,
22782278
struct rtl_tcb_desc *ptcb_desc);
2279-
void (*fill_fake_txdesc) (struct ieee80211_hw *hw, u8 *pDesc,
2280-
u32 buffer_len, bool bIsPsPoll);
2279+
void (*fill_fake_txdesc)(struct ieee80211_hw *hw, u8 *pdesc,
2280+
u32 buffer_len, bool bsspspoll);
22812281
void (*fill_tx_cmddesc) (struct ieee80211_hw *hw, u8 *pdesc,
22822282
bool firstseg, bool lastseg,
22832283
struct sk_buff *skb);

0 commit comments

Comments
 (0)