Commit 90b69822 authored by Fabio M. De Francesco's avatar Fabio M. De Francesco Committed by Greg Kroah-Hartman
Browse files

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: default avatarFabio M. De Francesco <fmdefrancesco@gmail.com>
Link: https://lore.kernel.org/r/20210411110458.15955-2-fmdefrancesco@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1b9e18de

drivers/staging/rtl8723bs/core/rtw_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -1507,7 +1507,7 @@ static void rtw_lps_change_dtim_hdl(struct adapter *padapter, u8 dtim) 
	if (pwrpriv->dtim != dtim)

		pwrpriv->dtim = dtim;



	if ((pwrpriv->bFwCurrentInPSMode == true) && (pwrpriv->pwr_mode > PS_MODE_ACTIVE)) {

	if ((pwrpriv->fw_current_in_ps_mode == true) && (pwrpriv->pwr_mode > PS_MODE_ACTIVE)) {

		u8 ps_mode = pwrpriv->pwr_mode;



		rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode));

drivers/staging/rtl8723bs/core/rtw_mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -1684,7 +1684,7 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter) 
	if (adapter->net_closed)

		return;



	if ((adapter_to_pwrctl(adapter)->bFwCurrentInPSMode)

	if ((adapter_to_pwrctl(adapter)->fw_current_in_ps_mode)

		&& !(hal_btcoex_IsBtControlLps(adapter))

		) {

		u8 bEnterPS;

drivers/staging/rtl8723bs/core/rtw_pwrctrl.c

+9 −9
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a 
			rtw_set_rpwm(padapter, PS_STATE_S4);



			rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode));

			pwrpriv->bFwCurrentInPSMode = false;

			pwrpriv->fw_current_in_ps_mode = false;



			hal_btcoex_LpsNotify(padapter, ps_mode);

		}
@@ -377,7 +377,7 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a 


			hal_btcoex_LpsNotify(padapter, ps_mode);



			pwrpriv->bFwCurrentInPSMode = true;

			pwrpriv->fw_current_in_ps_mode = true;

			pwrpriv->pwr_mode = ps_mode;

			pwrpriv->smart_ps = smart_ps;

			pwrpriv->bcn_ant_mode = bcn_ant_mode;
@@ -734,7 +734,7 @@ s32 rtw_register_task_alive(struct adapter *padapter, u32 task) 


	register_task_alive(pwrctrl, task);



	if (pwrctrl->bFwCurrentInPSMode) {

	if (pwrctrl->fw_current_in_ps_mode) {

		if (pwrctrl->cpwm < pslv) {

			if (pwrctrl->cpwm < PS_STATE_S2)

				res = _FAIL;
@@ -782,7 +782,7 @@ void rtw_unregister_task_alive(struct adapter *padapter, u32 task) 


	unregister_task_alive(pwrctrl, task);



	if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->bFwCurrentInPSMode) {

	if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->fw_current_in_ps_mode) {

		if (pwrctrl->cpwm > pslv)

			if ((pslv >= PS_STATE_S2) || (pwrctrl->alives == 0))

				rtw_set_rpwm(padapter, pslv);
@@ -819,7 +819,7 @@ s32 rtw_register_tx_alive(struct adapter *padapter) 


	register_task_alive(pwrctrl, XMIT_ALIVE);



	if (pwrctrl->bFwCurrentInPSMode) {

	if (pwrctrl->fw_current_in_ps_mode) {

		if (pwrctrl->cpwm < pslv) {

			if (pwrctrl->cpwm < PS_STATE_S2)

				res = _FAIL;
@@ -864,7 +864,7 @@ s32 rtw_register_cmd_alive(struct adapter *padapter) 


	register_task_alive(pwrctrl, CMD_ALIVE);



	if (pwrctrl->bFwCurrentInPSMode) {

	if (pwrctrl->fw_current_in_ps_mode) {

		if (pwrctrl->cpwm < pslv) {

			if (pwrctrl->cpwm < PS_STATE_S2)

				res = _FAIL;
@@ -909,7 +909,7 @@ void rtw_unregister_tx_alive(struct adapter *padapter) 


	unregister_task_alive(pwrctrl, XMIT_ALIVE);



	if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->bFwCurrentInPSMode) {

	if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->fw_current_in_ps_mode) {

		if (pwrctrl->cpwm > pslv)

			if ((pslv >= PS_STATE_S2) || (pwrctrl->alives == 0))

				rtw_set_rpwm(padapter, pslv);
@@ -945,7 +945,7 @@ void rtw_unregister_cmd_alive(struct adapter *padapter) 


	unregister_task_alive(pwrctrl, CMD_ALIVE);



	if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->bFwCurrentInPSMode) {

	if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->fw_current_in_ps_mode) {

		if (pwrctrl->cpwm > pslv) {

			if ((pslv >= PS_STATE_S2) || (pwrctrl->alives == 0))

				rtw_set_rpwm(padapter, pslv);
@@ -978,7 +978,7 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter) 
	pwrctrlpriv->power_mgnt = padapter->registrypriv.power_mgnt;/*  PS_MODE_MIN; */

	pwrctrlpriv->bLeisurePs = pwrctrlpriv->power_mgnt != PS_MODE_ACTIVE;



	pwrctrlpriv->bFwCurrentInPSMode = false;

	pwrctrlpriv->fw_current_in_ps_mode = false;



	pwrctrlpriv->rpwm = 0;

	pwrctrlpriv->cpwm = PS_STATE_S4;

drivers/staging/rtl8723bs/hal/hal_intf.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ void rtw_hal_dm_watchdog(struct adapter *padapter) 


void rtw_hal_dm_watchdog_in_lps(struct adapter *padapter)

{

	if (adapter_to_pwrctl(padapter)->bFwCurrentInPSMode == true) {

	if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode == true) {

		if (padapter->HalFunc.hal_dm_watchdog_in_lps)

			padapter->HalFunc.hal_dm_watchdog_in_lps(padapter); /* this function caller is in interrupt context */

	}

drivers/staging/rtl8723bs/hal/rtl8723b_dm.c

+3 −3
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ void rtl8723b_InitHalDm(struct adapter *Adapter) 


void rtl8723b_HalDmWatchDog(struct adapter *Adapter)

{

	bool bFwCurrentInPSMode = false;

	bool fw_current_in_ps_mode = false;

	bool bFwPSAwake = true;

	u8 hw_init_completed = false;

	struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
@@ -151,12 +151,12 @@ void rtl8723b_HalDmWatchDog(struct adapter *Adapter) 
	if (hw_init_completed == false)

		goto skip_dm;



	bFwCurrentInPSMode = adapter_to_pwrctl(Adapter)->bFwCurrentInPSMode;

	fw_current_in_ps_mode = adapter_to_pwrctl(Adapter)->fw_current_in_ps_mode;

	rtw_hal_get_hwreg(Adapter, HW_VAR_FWLPS_RF_ON, (u8 *)(&bFwPSAwake));



	if (

		(hw_init_completed == true) &&

		((!bFwCurrentInPSMode) && bFwPSAwake)

		((!fw_current_in_ps_mode) && bFwPSAwake)

	) {

		/*  */

		/*  Calculate Tx/Rx statistics. */