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

staging: rtl8723bs: Remove camelcase in several files

Remove camelcase in bFwCurrentInPSMode, a variable used by code
of several subdirectories/files of the driver. Issue detected by
checkpatch.pl. Delete the unnecessary "b" (that stands for "byte") from
the beginning of the name.

Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
Link: https://lore.kernel.org/r/20210411110458.15955-2-fmdefrancesco@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Fabio M. De Francesco and committed by
Greg Kroah-Hartman 90b69822 1b9e18de

+24 -24
+1 -1
drivers/staging/rtl8723bs/core/rtw_cmd.c
··· 1507 1507 if (pwrpriv->dtim != dtim) 1508 1508 pwrpriv->dtim = dtim; 1509 1509 1510 - if ((pwrpriv->bFwCurrentInPSMode == true) && (pwrpriv->pwr_mode > PS_MODE_ACTIVE)) { 1510 + if ((pwrpriv->fw_current_in_ps_mode == true) && (pwrpriv->pwr_mode > PS_MODE_ACTIVE)) { 1511 1511 u8 ps_mode = pwrpriv->pwr_mode; 1512 1512 1513 1513 rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode));
+1 -1
drivers/staging/rtl8723bs/core/rtw_mlme.c
··· 1684 1684 if (adapter->net_closed) 1685 1685 return; 1686 1686 1687 - if ((adapter_to_pwrctl(adapter)->bFwCurrentInPSMode) 1687 + if ((adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) 1688 1688 && !(hal_btcoex_IsBtControlLps(adapter)) 1689 1689 ) { 1690 1690 u8 bEnterPS;
+9 -9
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
··· 365 365 rtw_set_rpwm(padapter, PS_STATE_S4); 366 366 367 367 rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode)); 368 - pwrpriv->bFwCurrentInPSMode = false; 368 + pwrpriv->fw_current_in_ps_mode = false; 369 369 370 370 hal_btcoex_LpsNotify(padapter, ps_mode); 371 371 } ··· 377 377 378 378 hal_btcoex_LpsNotify(padapter, ps_mode); 379 379 380 - pwrpriv->bFwCurrentInPSMode = true; 380 + pwrpriv->fw_current_in_ps_mode = true; 381 381 pwrpriv->pwr_mode = ps_mode; 382 382 pwrpriv->smart_ps = smart_ps; 383 383 pwrpriv->bcn_ant_mode = bcn_ant_mode; ··· 734 734 735 735 register_task_alive(pwrctrl, task); 736 736 737 - if (pwrctrl->bFwCurrentInPSMode) { 737 + if (pwrctrl->fw_current_in_ps_mode) { 738 738 if (pwrctrl->cpwm < pslv) { 739 739 if (pwrctrl->cpwm < PS_STATE_S2) 740 740 res = _FAIL; ··· 782 782 783 783 unregister_task_alive(pwrctrl, task); 784 784 785 - if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->bFwCurrentInPSMode) { 785 + if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->fw_current_in_ps_mode) { 786 786 if (pwrctrl->cpwm > pslv) 787 787 if ((pslv >= PS_STATE_S2) || (pwrctrl->alives == 0)) 788 788 rtw_set_rpwm(padapter, pslv); ··· 819 819 820 820 register_task_alive(pwrctrl, XMIT_ALIVE); 821 821 822 - if (pwrctrl->bFwCurrentInPSMode) { 822 + if (pwrctrl->fw_current_in_ps_mode) { 823 823 if (pwrctrl->cpwm < pslv) { 824 824 if (pwrctrl->cpwm < PS_STATE_S2) 825 825 res = _FAIL; ··· 864 864 865 865 register_task_alive(pwrctrl, CMD_ALIVE); 866 866 867 - if (pwrctrl->bFwCurrentInPSMode) { 867 + if (pwrctrl->fw_current_in_ps_mode) { 868 868 if (pwrctrl->cpwm < pslv) { 869 869 if (pwrctrl->cpwm < PS_STATE_S2) 870 870 res = _FAIL; ··· 909 909 910 910 unregister_task_alive(pwrctrl, XMIT_ALIVE); 911 911 912 - if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->bFwCurrentInPSMode) { 912 + if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->fw_current_in_ps_mode) { 913 913 if (pwrctrl->cpwm > pslv) 914 914 if ((pslv >= PS_STATE_S2) || (pwrctrl->alives == 0)) 915 915 rtw_set_rpwm(padapter, pslv); ··· 945 945 946 946 unregister_task_alive(pwrctrl, CMD_ALIVE); 947 947 948 - if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->bFwCurrentInPSMode) { 948 + if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->fw_current_in_ps_mode) { 949 949 if (pwrctrl->cpwm > pslv) { 950 950 if ((pslv >= PS_STATE_S2) || (pwrctrl->alives == 0)) 951 951 rtw_set_rpwm(padapter, pslv); ··· 978 978 pwrctrlpriv->power_mgnt = padapter->registrypriv.power_mgnt;/* PS_MODE_MIN; */ 979 979 pwrctrlpriv->bLeisurePs = pwrctrlpriv->power_mgnt != PS_MODE_ACTIVE; 980 980 981 - pwrctrlpriv->bFwCurrentInPSMode = false; 981 + pwrctrlpriv->fw_current_in_ps_mode = false; 982 982 983 983 pwrctrlpriv->rpwm = 0; 984 984 pwrctrlpriv->cpwm = PS_STATE_S4;
+1 -1
drivers/staging/rtl8723bs/hal/hal_intf.c
··· 348 348 349 349 void rtw_hal_dm_watchdog_in_lps(struct adapter *padapter) 350 350 { 351 - if (adapter_to_pwrctl(padapter)->bFwCurrentInPSMode == true) { 351 + if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode == true) { 352 352 if (padapter->HalFunc.hal_dm_watchdog_in_lps) 353 353 padapter->HalFunc.hal_dm_watchdog_in_lps(padapter); /* this function caller is in interrupt context */ 354 354 }
+3 -3
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c
··· 141 141 142 142 void rtl8723b_HalDmWatchDog(struct adapter *Adapter) 143 143 { 144 - bool bFwCurrentInPSMode = false; 144 + bool fw_current_in_ps_mode = false; 145 145 bool bFwPSAwake = true; 146 146 u8 hw_init_completed = false; 147 147 struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); ··· 151 151 if (hw_init_completed == false) 152 152 goto skip_dm; 153 153 154 - bFwCurrentInPSMode = adapter_to_pwrctl(Adapter)->bFwCurrentInPSMode; 154 + fw_current_in_ps_mode = adapter_to_pwrctl(Adapter)->fw_current_in_ps_mode; 155 155 rtw_hal_get_hwreg(Adapter, HW_VAR_FWLPS_RF_ON, (u8 *)(&bFwPSAwake)); 156 156 157 157 if ( 158 158 (hw_init_completed == true) && 159 - ((!bFwCurrentInPSMode) && bFwPSAwake) 159 + ((!fw_current_in_ps_mode) && bFwPSAwake) 160 160 ) { 161 161 /* */ 162 162 /* Calculate Tx/Rx statistics. */
+1 -1
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
··· 428 428 struct hal_com_data *pHalData = GET_HAL_DATA(padapter); 429 429 430 430 /* Init Fw LPS related. */ 431 - adapter_to_pwrctl(padapter)->bFwCurrentInPSMode = false; 431 + adapter_to_pwrctl(padapter)->fw_current_in_ps_mode = false; 432 432 433 433 /* Init H2C cmd. */ 434 434 rtw_write8(padapter, REG_HMETFR, 0x0f);
+7 -7
drivers/staging/rtl8723bs/hal/sdio_ops.c
··· 170 170 if ( 171 171 ((device_id == WLAN_IOREG_DEVICE_ID) && (offset < 0x100)) || 172 172 (!mac_pwr_ctrl_on) || 173 - (adapter_to_pwrctl(adapter)->bFwCurrentInPSMode) 173 + (adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) 174 174 ) { 175 175 err = sd_cmd52_read(intfhdl, ftaddr, 4, (u8 *)&le_tmp); 176 176 return le32_to_cpu(le_tmp); ··· 216 216 if ( 217 217 ((device_id == WLAN_IOREG_DEVICE_ID) && (offset < 0x100)) || 218 218 (!mac_pwr_ctrl_on) || 219 - (adapter_to_pwrctl(adapter)->bFwCurrentInPSMode) 219 + (adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) 220 220 ) 221 221 return sd_cmd52_read(intfhdl, ftaddr, cnt, buf); 222 222 ··· 283 283 if ( 284 284 ((device_id == WLAN_IOREG_DEVICE_ID) && (offset < 0x100)) || 285 285 (!mac_pwr_ctrl_on) || 286 - (adapter_to_pwrctl(adapter)->bFwCurrentInPSMode) 286 + (adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) 287 287 ) { 288 288 le_tmp = cpu_to_le32(val); 289 289 ··· 320 320 if ( 321 321 ((device_id == WLAN_IOREG_DEVICE_ID) && (offset < 0x100)) || 322 322 (!mac_pwr_ctrl_on) || 323 - (adapter_to_pwrctl(adapter)->bFwCurrentInPSMode) 323 + (adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) 324 324 ) 325 325 return sd_cmd52_write(intfhdl, ftaddr, cnt, buf); 326 326 ··· 551 551 rtw_hal_get_hwreg(adapter, HW_VAR_APFM_ON_MAC, &mac_pwr_ctrl_on); 552 552 if ( 553 553 (!mac_pwr_ctrl_on) || 554 - (adapter_to_pwrctl(adapter)->bFwCurrentInPSMode) 554 + (adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) 555 555 ) 556 556 return sd_cmd52_read(intfhdl, addr, cnt, buf); 557 557 ··· 591 591 rtw_hal_get_hwreg(adapter, HW_VAR_APFM_ON_MAC, &mac_pwr_ctrl_on); 592 592 if ( 593 593 (!mac_pwr_ctrl_on) || 594 - (adapter_to_pwrctl(adapter)->bFwCurrentInPSMode) 594 + (adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) 595 595 ) 596 596 return sd_cmd52_write(intfhdl, addr, cnt, buf); 597 597 ··· 640 640 641 641 hal_sdio_get_cmd_addr_8723b(adapter, SDIO_LOCAL_DEVICE_ID, addr, &addr); 642 642 rtw_hal_get_hwreg(adapter, HW_VAR_APFM_ON_MAC, &mac_pwr_ctrl_on); 643 - if (!mac_pwr_ctrl_on || adapter_to_pwrctl(adapter)->bFwCurrentInPSMode) { 643 + if (!mac_pwr_ctrl_on || adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) { 644 644 sd_cmd52_read(intfhdl, addr, 4, (u8 *)&le_tmp); 645 645 val = le32_to_cpu(le_tmp); 646 646 } else {
+1 -1
drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
··· 203 203 u8 LpsIdleCount; 204 204 u8 power_mgnt; 205 205 u8 org_power_mgnt; 206 - u8 bFwCurrentInPSMode; 206 + u8 fw_current_in_ps_mode; 207 207 unsigned long DelayLPSLastTimeStamp; 208 208 s32 pnp_current_pwr_state; 209 209 u8 pnp_bstop_trx;