UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: r8188eu: internal autosuspend is always false 

bInternalAutoSuspend is always false. Remove the variable and related
checks.

Acked-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220102175932.89127-3-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Martin Kaiser 2022-01-02 18:59:29 +01:00 committed by Greg Kroah-Hartman
parent 881bc5e02f
commit fdf101f5ce
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/r8188eu/core/rtw_pwrctrl.c
View File

@ -351,7 +351,6 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
pwrctrlpriv->pwr_state_check_interval = RTW_PWR_STATE_CHK_INTERVAL; pwrctrlpriv->pwr_state_check_interval = RTW_PWR_STATE_CHK_INTERVAL;
pwrctrlpriv->pwr_state_check_cnts = 0; pwrctrlpriv->pwr_state_check_cnts = 0;
pwrctrlpriv->bInternalAutoSuspend = false;
pwrctrlpriv->bInSuspend = false; pwrctrlpriv->bInSuspend = false;
pwrctrlpriv->bkeepfwalive = false; pwrctrlpriv->bkeepfwalive = false;
@ -396,7 +395,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
} }
/* System suspend is not allowed to wakeup */ /* System suspend is not allowed to wakeup */
if ((!pwrpriv->bInternalAutoSuspend) && pwrpriv->bInSuspend) { if (pwrpriv->bInSuspend) {
while (pwrpriv->bInSuspend && while (pwrpriv->bInSuspend &&
(rtw_get_passing_time_ms(start) <= 3000 || (rtw_get_passing_time_ms(start) <= 3000 ||
(rtw_get_passing_time_ms(start) <= 500))) (rtw_get_passing_time_ms(start) <= 500)))
@ -407,12 +406,6 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
DBG_88E("%s wait bInSuspend done\n", __func__); DBG_88E("%s wait bInSuspend done\n", __func__);
} }
/* block??? */
if ((pwrpriv->bInternalAutoSuspend) && (padapter->net_closed)) {
ret = _FAIL;
goto exit;
}
/* I think this should be check in IPS, LPS, autosuspend functions... */ /* I think this should be check in IPS, LPS, autosuspend functions... */
if (check_fwstate(pmlmepriv, _FW_LINKED)) { if (check_fwstate(pmlmepriv, _FW_LINKED)) {
ret = _SUCCESS; ret = _SUCCESS;

1
drivers/staging/r8188eu/include/rtw_pwrctrl.h
View File

@ -75,7 +75,6 @@ struct pwrctrl_priv {
s32 pnp_current_pwr_state; s32 pnp_current_pwr_state;
u8 pnp_bstop_trx; u8 pnp_bstop_trx;
u8 bInternalAutoSuspend;
u8 bInSuspend; u8 bInSuspend;
u8 bSupportRemoteWakeup; u8 bSupportRemoteWakeup;
struct timer_list pwr_state_check_timer; struct timer_list pwr_state_check_timer;

4
drivers/staging/r8188eu/os_dep/os_intfs.c
View File

@ -760,10 +760,6 @@ int netdev_close(struct net_device *pnetdev)
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
if (padapter->pwrctrlpriv.bInternalAutoSuspend) {
if (padapter->pwrctrlpriv.rf_pwrstate == rf_off)
padapter->pwrctrlpriv.ps_flag = true;
}
padapter->net_closed = true; padapter->net_closed = true;
if (padapter->pwrctrlpriv.rf_pwrstate == rf_on) { if (padapter->pwrctrlpriv.rf_pwrstate == rf_on) {

3
drivers/staging/r8188eu/os_dep/usb_intf.c
View File

@ -192,8 +192,7 @@ static void rtw_dev_unload(struct adapter *padapter)
if (padapter->intf_stop) if (padapter->intf_stop)
padapter->intf_stop(padapter); padapter->intf_stop(padapter);
/* s4. */ /* s4. */
if (!padapter->pwrctrlpriv.bInternalAutoSuspend) rtw_stop_drv_threads(padapter);
rtw_stop_drv_threads(padapter);
/* s5. */ /* s5. */
if (!padapter->bSurpriseRemoved) { if (!padapter->bSurpriseRemoved) {