Commit 0f982e7e authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove rtw_set_rpwm 



After we dropped the call to set HW_VAR_SET_RPWM, the rtw_set_rpwm
function doesn't do anything useful.

Remove the function and the rpwm component of struct pwrctrl_priv,
which is not used outside of rtw_set_rpwm.

Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20210913185110.3065-2-martin@kaiser.cx


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

drivers/staging/r8188eu/core/rtw_pwrctrl.c

+0 −34
Original line number Diff line number Diff line
@@ -166,35 +166,6 @@ static void pwr_state_check_handler(struct timer_list *t) 
	rtw_ps_cmd(padapter);

}



/*

 *

 * Parameters

 *	padapter

 *	pslv			power state level, only could be PS_STATE_S0 ~ PS_STATE_S4

 *

 */

void rtw_set_rpwm(struct adapter *padapter, u8 pslv)

{

	struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;



	pslv = PS_STATE(pslv);



	if (pwrpriv->rpwm == pslv)

		return;



	if ((padapter->bSurpriseRemoved) ||

	    (!padapter->hw_init_completed)) {

		return;

	}



	if (padapter->bDriverStopped) {

		if (pslv < PS_STATE_S2)

			return;

	}



	pwrpriv->rpwm = pslv;

}



static u8 PS_RDY_CHECK(struct adapter *padapter)

{

	u32 curr_time, delta_time;
@@ -244,7 +215,6 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a 
		if (pwdinfo->opp_ps == 0) {

			DBG_88E("rtw_set_ps_mode: Leave 802.11 power save\n");

			pwrpriv->pwr_mode = ps_mode;

			rtw_set_rpwm(padapter, PS_STATE_S4);

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

			pwrpriv->bFwCurrentInPSMode = false;

		}
@@ -260,8 +230,6 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a 
			/*  Set CTWindow after LPS */

			if (pwdinfo->opp_ps == 1)

				p2p_ps_wk_cmd(padapter, P2P_PS_ENABLE, 0);



			rtw_set_rpwm(padapter, PS_STATE_S2);

		}

	}
@@ -396,8 +364,6 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter) 


	pwrctrlpriv->bFwCurrentInPSMode = false;



	pwrctrlpriv->rpwm = 0;



	pwrctrlpriv->pwr_mode = PS_MODE_ACTIVE;

	pwrctrlpriv->smart_ps = padapter->registrypriv.smart_ps;

	pwrctrlpriv->bcn_ant_mode = 0;

drivers/staging/r8188eu/include/rtw_pwrctrl.h

+0 −2
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ enum { /* for ips_mode */ 


struct pwrctrl_priv {

	struct semaphore lock;

	volatile u8 rpwm; /*  requested power state for fw */

	volatile u8 cpwm_tog; /*  toggling */



	u8	pwr_mode;
@@ -233,7 +232,6 @@ void rtw_free_pwrctrl_priv(struct adapter *adapter); 


void rtw_set_ps_mode(struct adapter *adapter, u8 ps_mode, u8 smart_ps,

		     u8 bcn_ant_mode);

void rtw_set_rpwm(struct adapter *adapter, u8 val8);

void LeaveAllPowerSaveMode(struct adapter *adapter);

void ips_enter(struct adapter *padapter);

int ips_leave(struct adapter *padapter);