staging: r8188eu: pwr_state_check_cnts is always zero

The field pwr_state_check_cnts in struct pwrctrl_priv is set to 0 and
never changed. Remove it and remove related dead code.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220404082142.4639-5-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_pwrctrl.c b/drivers/staging/r8188eu/core/rtw_pwrctrl.c
index 5d468e8b4920d80a873aba819d611270a36b86b5..939909e5316f63c303a1681430b81e4e64f2ec6e 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_pwrctrl.c
+++ b/drivers/staging/r8188eu/core/rtw_pwrctrl.c
@@ -133,9 +133,8 @@ void rtw_ps_processor(struct adapter *padapter)
        if (!rtw_pwr_unassociated_idle(padapter))
                goto exit;
 
-       if ((pwrpriv->rf_pwrstate == rf_on) && ((pwrpriv->pwr_state_check_cnts % 4) == 0)) {
+       if (pwrpriv->rf_pwrstate == rf_on) {
                pwrpriv->change_rfpwrstate = rf_off;
-
                ips_enter(padapter);
        }
 exit:
@@ -342,7 +341,6 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
        pwrctrlpriv->ips_mode_req = padapter->registrypriv.ips_mode;
 
        pwrctrlpriv->pwr_state_check_interval = RTW_PWR_STATE_CHK_INTERVAL;
-       pwrctrlpriv->pwr_state_check_cnts = 0;
        pwrctrlpriv->bInSuspend = false;
        pwrctrlpriv->bkeepfwalive = false;
 

diff --git a/drivers/staging/r8188eu/include/rtw_pwrctrl.h b/drivers/staging/r8188eu/include/rtw_pwrctrl.h
index 94a65056a77ea27279056cf143308f8b1bc2f2a9..162792988910fe4c39330fd81d87d4e96f081174 100644 (file)
--- a/drivers/staging/r8188eu/include/rtw_pwrctrl.h
+++ b/drivers/staging/r8188eu/include/rtw_pwrctrl.h
@@ -69,7 +69,6 @@ struct pwrctrl_priv {
        u8              bSupportRemoteWakeup;
        struct timer_list pwr_state_check_timer;
        int             pwr_state_check_interval;
-       u8              pwr_state_check_cnts;
 
        int             ps_flag;
 

diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index c531504acc9ee493d2c7b1fd2c66d5c412ff1905..5a9374957e3a006082c3947a3278f6f022387554 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -441,7 +441,6 @@ static void rtw_init_default_value(struct adapter *padapter)
 u8 rtw_reset_drv_sw(struct adapter *padapter)
 {
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
-       struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
 
        /* hal_priv */
        rtl8188eu_init_default_value(padapter);
@@ -457,8 +456,6 @@ u8 rtw_reset_drv_sw(struct adapter *padapter)
 
        _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING);
 
-       pwrctrlpriv->pwr_state_check_cnts = 0;
-
        /* mlmeextpriv */
        padapter->mlmeextpriv.sitesurvey_res.state = SCAN_DISABLE;