From 3b9d0da6aa08a34426489b2836d2f63ab7bc2051 Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Wed, 13 Apr 2022 21:36:51 +0200 Subject: staging: r8188eu: use kernel functions for timeout handling Use the kernel functions to set a timeout and to check if it's expired. Signed-off-by: Martin Kaiser Link: https://lore.kernel.org/r/20220413193654.258507-6-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- drivers/staging/r8188eu/core/rtw_pwrctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_pwrctrl.c b/drivers/staging/r8188eu/core/rtw_pwrctrl.c index ff96e5229b52..2ad6105e6ec4 100644 --- a/drivers/staging/r8188eu/core/rtw_pwrctrl.c +++ b/drivers/staging/r8188eu/core/rtw_pwrctrl.c @@ -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... */ -- cgit v1.2.3-59-g8ed1b