staging: r8188eu: use kernel functions for timeout handling
authorMartin Kaiser <martin@kaiser.cx>
Wed, 13 Apr 2022 19:36:51 +0000 (21:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 14 Apr 2022 07:06:59 +0000 (09:06 +0200)
Use the kernel functions to set a timeout and to check if it's expired.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220413193654.258507-6-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_pwrctrl.c

index ff96e52..2ad6105 100644 (file)
@@ -372,8 +372,8 @@ int rtw_pwr_wakeup(struct adapter *padapter)
 {
        struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
+       unsigned long timeout = jiffies + msecs_to_jiffies(3000);
        int ret = _SUCCESS;
-       u32 start = jiffies;
        u32 ips_deffer_ms;
 
        /* the ms will prevent from falling into IPS after wakeup */
@@ -382,11 +382,11 @@ int rtw_pwr_wakeup(struct adapter *padapter)
        if (pwrpriv->ips_deny_time < jiffies + rtw_ms_to_systime(ips_deffer_ms))
                pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ips_deffer_ms);
 
-       while (pwrpriv->ps_processing && rtw_get_passing_time_ms(start) <= 3000)
+       while (pwrpriv->ps_processing && time_before(jiffies, timeout))
                msleep(10);
 
        /* System suspend is not allowed to wakeup */
-       while (pwrpriv->bInSuspend && rtw_get_passing_time_ms(start) <= 3000)
+       while (pwrpriv->bInSuspend && time_before(jiffies, timeout))
                msleep(10);
 
        /* I think this should be check in IPS, LPS, autosuspend functions... */