staging: r8188eu: improve timeout handling in LPS_RF_ON_check
authorMartin Kaiser <martin@kaiser.cx>
Sat, 9 Apr 2022 16:32:09 +0000 (18:32 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 12 Apr 2022 13:49:58 +0000 (15:49 +0200)
Use the standard kernel functions to define and check the timeout in
LPS_RF_ON_check.

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

index bd03b22..8c2e983 100644 (file)
@@ -250,10 +250,9 @@ static bool lps_rf_on(struct adapter *adapter)
  */
 static s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms)
 {
-       u32 start_time;
+       unsigned long timeout = jiffies + msecs_to_jiffies(delay_ms);
        s32 err = 0;
 
-       start_time = jiffies;
        while (1) {
                if (lps_rf_on(padapter))
                        break;
@@ -263,7 +262,7 @@ static s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms)
                        break;
                }
 
-               if (rtw_get_passing_time_ms(start_time) > delay_ms) {
+               if (time_after(jiffies, timeout)) {
                        err = -1;
                        break;
                }