Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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]'
#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]'
#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
#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
#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
#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
#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
#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
#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
#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 <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

authored by

Larry Finger and committed by
Kalle Valo
e703c5dd 03f3dd37

+60 -60
+1 -1
drivers/net/wireless/realtek/rtlwifi/debug.h
··· 136 136 FEEPROM = 11, 137 137 FPWR = 12, 138 138 FDM = 13, 139 - FDBGCtrl = 14, 139 + FDBGCTRL = 14, 140 140 FC2H = 15, 141 141 FBT = 16, 142 142 FINIT = 17,
+22 -22
drivers/net/wireless/realtek/rtlwifi/efuse.c
··· 365 365 { 366 366 struct rtl_priv *rtlpriv = rtl_priv(hw); 367 367 struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw)); 368 - u8 section_idx, i, Base; 368 + u8 section_idx, i, base; 369 369 u16 words_need = 0, hdr_num = 0, totalbytes, efuse_used; 370 370 bool wordchanged, result = true; 371 371 372 372 for (section_idx = 0; section_idx < 16; section_idx++) { 373 - Base = section_idx * 8; 373 + base = section_idx * 8; 374 374 wordchanged = false; 375 375 376 376 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]) { 382 382 words_need++; 383 383 wordchanged = true; 384 384 } ··· 519 519 } 520 520 EXPORT_SYMBOL(rtl_efuse_shadow_map_update); 521 521 522 - void efuse_force_write_vendor_Id(struct ieee80211_hw *hw) 522 + void efuse_force_write_vendor_id(struct ieee80211_hw *hw) 523 523 { 524 524 u8 tmpdata[8] = { 0xFF, 0xFF, 0xEC, 0x10, 0xFF, 0xFF, 0xFF, 0xFF }; 525 525 ··· 1111 1111 struct rtl_priv *rtlpriv = rtl_priv(hw); 1112 1112 struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); 1113 1113 u8 tempval; 1114 - u16 tmpV16; 1114 + u16 tmpv16; 1115 1115 1116 1116 if (pwrstate && (rtlhal->hw_type != HARDWARE_TYPE_RTL8192SE)) { 1117 1117 ··· 1120 1120 rtl_write_byte(rtlpriv, 1121 1121 rtlpriv->cfg->maps[EFUSE_ACCESS], 0x69); 1122 1122 } else { 1123 - tmpV16 = 1123 + tmpv16 = 1124 1124 rtl_read_word(rtlpriv, 1125 1125 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]; 1128 1128 rtl_write_word(rtlpriv, 1129 1129 rtlpriv->cfg->maps[SYS_ISO_CTRL], 1130 - tmpV16); 1130 + tmpv16); 1131 1131 } 1132 1132 } 1133 - tmpV16 = rtl_read_word(rtlpriv, 1133 + tmpv16 = rtl_read_word(rtlpriv, 1134 1134 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]; 1137 1137 rtl_write_word(rtlpriv, 1138 - rtlpriv->cfg->maps[SYS_FUNC_EN], tmpV16); 1138 + rtlpriv->cfg->maps[SYS_FUNC_EN], tmpv16); 1139 1139 } 1140 1140 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] | 1145 1145 rtlpriv->cfg->maps[EFUSE_ANA8M]); 1146 1146 rtl_write_word(rtlpriv, 1147 - rtlpriv->cfg->maps[SYS_CLK], tmpV16); 1147 + rtlpriv->cfg->maps[SYS_CLK], tmpv16); 1148 1148 } 1149 1149 } 1150 1150
+1 -1
drivers/net/wireless/realtek/rtlwifi/efuse.h
··· 85 85 bool efuse_shadow_update(struct ieee80211_hw *hw); 86 86 bool efuse_shadow_update_chk(struct ieee80211_hw *hw); 87 87 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); 89 89 void efuse_re_pg_section(struct ieee80211_hw *hw, u8 section_idx); 90 90 void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate); 91 91 int rtl_get_hwinfo(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv,
+4 -4
drivers/net/wireless/realtek/rtlwifi/regd.c
··· 4 4 #include "wifi.h" 5 5 #include "regd.h" 6 6 7 - static struct country_code_to_enum_rd allCountries[] = { 7 + static struct country_code_to_enum_rd all_countries[] = { 8 8 {COUNTRY_CODE_FCC, "US"}, 9 9 {COUNTRY_CODE_IC, "US"}, 10 10 {COUNTRY_CODE_ETSI, "EC"}, ··· 369 369 { 370 370 int i; 371 371 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]; 375 375 } 376 376 return NULL; 377 377 }
+2 -2
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
··· 393 393 (GET_RX_DESC_FAGGR(pdesc) == 1)); 394 394 if (status->packet_report_type == NORMAL_RX) 395 395 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); 397 397 status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc); 398 398 399 399 status->is_cck = RTL8188_RX_HAL_IS_CCK_RATE(status->rate); ··· 420 420 if (status->crc) 421 421 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC; 422 422 423 - if (status->rx_is40Mhzpacket) 423 + if (status->rx_is40mhzpacket) 424 424 rx_status->bw = RATE_INFO_BW_40; 425 425 426 426 if (status->is_ht)
+2 -2
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
··· 332 332 stats->isfirst_ampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1) 333 333 && (GET_RX_DESC_FAGGR(pdesc) == 1)); 334 334 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); 336 336 stats->is_ht = (bool)GET_RX_DESC_RXHT(pdesc); 337 337 338 338 stats->is_cck = RX_HAL_IS_CCK_RATE(pdesc->rxmcs); ··· 346 346 if (stats->crc) 347 347 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC; 348 348 349 - if (stats->rx_is40Mhzpacket) 349 + if (stats->rx_is40mhzpacket) 350 350 rx_status->bw = RATE_INFO_BW_40; 351 351 352 352 if (stats->is_ht)
+1 -1
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c
··· 1331 1331 _rtl92cu_set_media_status(hw, opmode); 1332 1332 rtlpriv->cfg->ops->led_control(hw, LED_CTL_POWER_OFF); 1333 1333 RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC); 1334 - if (rtlusb->disableHWSM) 1334 + if (rtlusb->disablehwsm) 1335 1335 _CardDisableHWSM(hw); 1336 1336 else 1337 1337 _CardDisableWithoutHWSM(hw);
+2 -2
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c
··· 298 298 stats->isfirst_ampdu = (bool)((GET_RX_DESC_PAGGR(pdesc) == 1) 299 299 && (GET_RX_DESC_FAGGR(pdesc) == 1)); 300 300 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); 302 302 stats->is_ht = (bool)GET_RX_DESC_RX_HT(pdesc); 303 303 rx_status->freq = hw->conf.chandef.chan->center_freq; 304 304 rx_status->band = hw->conf.chandef.chan->band; ··· 365 365 stats.isampdu = (bool) ((GET_RX_DESC_PAGGR(rxdesc) == 1) 366 366 && (GET_RX_DESC_FAGGR(rxdesc) == 1)); 367 367 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); 369 369 stats.is_ht = (bool)GET_RX_DESC_RX_HT(rxdesc); 370 370 /* TODO: is center_freq changed when doing scan? */ 371 371 /* TODO: Shall we add protection or just skip those two step? */
+1 -1
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
··· 472 472 stats->isfirst_ampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1) 473 473 && (GET_RX_DESC_FAGGR(pdesc) == 1)); 474 474 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); 476 476 stats->is_ht = (bool)GET_RX_DESC_RXHT(pdesc); 477 477 rx_status->freq = hw->conf.chandef.chan->center_freq; 478 478 rx_status->band = hw->conf.chandef.chan->band;
+1 -1
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
··· 371 371 if (status->crc) 372 372 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC; 373 373 374 - if (status->rx_is40Mhzpacket) 374 + if (status->rx_is40mhzpacket) 375 375 rx_status->bw = RATE_INFO_BW_40; 376 376 377 377 if (status->is_ht)
+2 -2
drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c
··· 253 253 stats->isfirst_ampdu = (bool) ((GET_RX_STATUS_DESC_PAGGR(pdesc) == 1) 254 254 && (GET_RX_STATUS_DESC_FAGGR(pdesc) == 1)); 255 255 stats->timestamp_low = GET_RX_STATUS_DESC_TSFL(pdesc); 256 - stats->rx_is40Mhzpacket = (bool)GET_RX_STATUS_DESC_BW(pdesc); 256 + stats->rx_is40mhzpacket = (bool)GET_RX_STATUS_DESC_BW(pdesc); 257 257 stats->is_ht = (bool)GET_RX_STATUS_DESC_RX_HT(pdesc); 258 258 stats->is_cck = SE_RX_HAL_IS_CCK_RATE(pdesc); 259 259 ··· 266 266 if (stats->crc) 267 267 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC; 268 268 269 - if (stats->rx_is40Mhzpacket) 269 + if (stats->rx_is40mhzpacket) 270 270 rx_status->bw = RATE_INFO_BW_40; 271 271 272 272 if (stats->is_ht)
+2 -2
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
··· 280 280 status->isfirst_ampdu = (bool)((GET_RX_DESC_PAGGR(pdesc) == 1) && 281 281 (GET_RX_DESC_FAGGR(pdesc) == 1)); 282 282 status->timestamp_low = GET_RX_DESC_TSFL(pdesc); 283 - status->rx_is40Mhzpacket = (bool)GET_RX_DESC_BW(pdesc); 283 + status->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc); 284 284 status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc); 285 285 286 286 status->is_cck = RX_HAL_IS_CCK_RATE(status->rate); ··· 294 294 if (status->crc) 295 295 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC; 296 296 297 - if (status->rx_is40Mhzpacket) 297 + if (status->rx_is40mhzpacket) 298 298 rx_status->bw = RATE_INFO_BW_40; 299 299 300 300 if (status->is_ht)
+2 -2
drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
··· 316 316 status->isampdu = (bool)(GET_RX_DESC_PAGGR(pdesc) == 1); 317 317 status->isfirst_ampdu = (bool)(GET_RX_DESC_PAGGR(pdesc) == 1); 318 318 status->timestamp_low = GET_RX_DESC_TSFL(pdesc); 319 - status->rx_is40Mhzpacket = (bool)GET_RX_DESC_BW(pdesc); 319 + status->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc); 320 320 status->bandwidth = (u8)GET_RX_DESC_BW(pdesc); 321 321 status->macid = GET_RX_DESC_MACID(pdesc); 322 322 status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc); ··· 350 350 if (status->crc) 351 351 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC; 352 352 353 - if (status->rx_is40Mhzpacket) 353 + if (status->rx_is40mhzpacket) 354 354 rx_status->bw = RATE_INFO_BW_40; 355 355 356 356 if (status->is_ht)
+3 -3
drivers/net/wireless/realtek/rtlwifi/usb.c
··· 194 194 _usb_write_async(to_usb_device(dev), addr, val, 4); 195 195 } 196 196 197 - static void _usb_writeN_sync(struct rtl_priv *rtlpriv, u32 addr, void *data, 197 + static void _usb_writen_sync(struct rtl_priv *rtlpriv, u32 addr, void *data, 198 198 u16 len) 199 199 { 200 200 struct device *dev = rtlpriv->io.dev; ··· 229 229 rtlpriv->io.read8_sync = _usb_read8_sync; 230 230 rtlpriv->io.read16_sync = _usb_read16_sync; 231 231 rtlpriv->io.read32_sync = _usb_read32_sync; 232 - rtlpriv->io.writeN_sync = _usb_writeN_sync; 232 + rtlpriv->io.writen_sync = _usb_writen_sync; 233 233 } 234 234 235 235 static void _rtl_usb_io_handler_release(struct ieee80211_hw *hw) ··· 393 393 rtlusb->irq_mask[0] = 0xFFFFFFFF; 394 394 /* HIMR_EX - turn all on */ 395 395 rtlusb->irq_mask[1] = 0xFFFFFFFF; 396 - rtlusb->disableHWSM = true; 396 + rtlusb->disablehwsm = true; 397 397 } 398 398 399 399 static void _rtl_rx_completed(struct urb *urb);
+1 -1
drivers/net/wireless/realtek/rtlwifi/usb.h
··· 84 84 /* Bcn control register setting */ 85 85 u32 reg_bcn_ctrl_val; 86 86 /* for 88/92cu card disable */ 87 - u8 disableHWSM; 87 + u8 disablehwsm; 88 88 /*QOS & EDCA */ 89 89 enum acm_method acm_method; 90 90 /* irq . HIMR,HIMR_EX */
+13 -13
drivers/net/wireless/realtek/rtlwifi/wifi.h
··· 241 241 u8 date; 242 242 u8 hour; 243 243 u8 minute; 244 - __le16 ramcodeSize; 244 + __le16 ramcodesize; 245 245 __le16 rsvd2; 246 246 __le32 svnindex; 247 247 __le32 rsvd3; ··· 443 443 HW_VAR_MCS_RATE_AVAILABLE = 0x1f, 444 444 HW_VAR_AC_PARAM = 0x20, 445 445 HW_VAR_ACM_CTRL = 0x21, 446 - HW_VAR_DIS_Req_Qsize = 0x22, 446 + HW_VAR_DIS_REQ_QSIZE = 0x22, 447 447 HW_VAR_CCX_CHNL_LOAD = 0x23, 448 448 HW_VAR_CCX_NOISE_HISTOGRAM = 0x24, 449 449 HW_VAR_CCX_CLM_NHM = 0x25, 450 - HW_VAR_TxOPLimit = 0x26, 450 + HW_VAR_TXOPLIMIT = 0x26, 451 451 HW_VAR_TURBO_MODE = 0x27, 452 452 HW_VAR_RF_STATE = 0x28, 453 453 HW_VAR_RF_OFF_BY_HW = 0x29, ··· 500 500 HW_VAR_BCN_VALID = 0x55, 501 501 HW_VAR_FWLPS_RF_ON = 0x56, 502 502 HW_VAR_DUAL_TSF_RST = 0x57, 503 - HW_VAR_SWITCH_EPHY_WoWLAN = 0x58, 503 + HW_VAR_SWITCH_EPHY_WOWLAN = 0x58, 504 504 HW_VAR_INT_MIGRATION = 0x59, 505 505 HW_VAR_INT_AC = 0x5a, 506 506 HW_VAR_RF_TIMING = 0x5b, ··· 792 792 FW_PS_UAPSD_MODE = 6, 793 793 FW_PS_IBSS_MODE = 7, 794 794 FW_PS_WWLAN_MODE = 8, 795 - FW_PS_PM_Radio_Off = 9, 796 - FW_PS_PM_Card_Disable = 10, 795 + FW_PS_PM_RADIO_OFF = 9, 796 + FW_PS_PM_CARD_DISABLE = 10, 797 797 }; 798 798 799 799 enum rt_psmode { ··· 827 827 /*QoS related.*/ 828 828 /*acm implementation method.*/ 829 829 enum acm_method { 830 - eAcmWay0_SwAndHw = 0, 831 - eAcmWay1_HW = 1, 830 + EACMWAY0_SWANDHW = 0, 831 + EACMWAY1_HW = 1, 832 832 EACMWAY2_SW = 2, 833 833 }; 834 834 ··· 1459 1459 void (*write8_async) (struct rtl_priv *rtlpriv, u32 addr, u8 val); 1460 1460 void (*write16_async) (struct rtl_priv *rtlpriv, u32 addr, u16 val); 1461 1461 void (*write32_async) (struct rtl_priv *rtlpriv, u32 addr, u32 val); 1462 - void (*writeN_sync) (struct rtl_priv *rtlpriv, u32 addr, void *buf, 1462 + void (*writen_sync)(struct rtl_priv *rtlpriv, u32 addr, void *buf, 1463 1463 u16 len); 1464 1464 1465 1465 u8(*read8_sync) (struct rtl_priv *rtlpriv, u32 addr); ··· 1876 1876 1877 1877 struct rtl_efuse { 1878 1878 const struct rtl_efuse_ops *efuse_ops; 1879 - bool autoLoad_ok; 1879 + bool autoload_ok; 1880 1880 bool bootfromefuse; 1881 1881 u16 max_physical_size; 1882 1882 ··· 2103 2103 u8 rx_bufshift; 2104 2104 bool isampdu; 2105 2105 bool isfirst_ampdu; 2106 - bool rx_is40Mhzpacket; 2106 + bool rx_is40mhzpacket; 2107 2107 u8 rx_packet_bw; 2108 2108 u32 rx_pwdb_all; 2109 2109 u8 rx_mimo_signalstrength[4]; /*in 0~100 index */ ··· 2254 2254 struct ieee80211_sta *sta, 2255 2255 struct sk_buff *skb, u8 hw_queue, 2256 2256 struct rtl_tcb_desc *ptcb_desc); 2257 - void (*fill_fake_txdesc) (struct ieee80211_hw *hw, u8 *pDesc, 2258 - u32 buffer_len, bool bIsPsPoll); 2257 + void (*fill_fake_txdesc)(struct ieee80211_hw *hw, u8 *pdesc, 2258 + u32 buffer_len, bool bsspspoll); 2259 2259 void (*fill_tx_cmddesc) (struct ieee80211_hw *hw, u8 *pdesc, 2260 2260 bool firstseg, bool lastseg, 2261 2261 struct sk_buff *skb);