From nobody Mon May 11 08:32:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3993C433EF for ; Sat, 9 Apr 2022 16:32:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242622AbiDIQei (ORCPT ); Sat, 9 Apr 2022 12:34:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241904AbiDIQe3 (ORCPT ); Sat, 9 Apr 2022 12:34:29 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3063B23EC7A for ; Sat, 9 Apr 2022 09:32:21 -0700 (PDT) Received: from ipservice-092-217-091-111.092.217.pools.vodafone-ip.de ([92.217.91.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1ndE0X-0006Rg-Ty; Sat, 09 Apr 2022 18:32:18 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 01/10] staging: r8188eu: no need for an else after return Date: Sat, 9 Apr 2022 18:32:03 +0200 Message-Id: <20220409163212.241122-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220409163212.241122-1-martin@kaiser.cx> References: <20220409163212.241122-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The else branch at the end of send_beacon is not necessary. We return in the if branch. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 474391bf7cb5..babadfc279bc 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5767,13 +5767,11 @@ unsigned int send_beacon(struct adapter *padapter) =20 if (padapter->bSurpriseRemoved || padapter->bDriverStopped) return _FAIL; - if (!bxmitok) { + if (!bxmitok) return _FAIL; - } else { - rtw_get_passing_time_ms(start); =20 - return _SUCCESS; - } + rtw_get_passing_time_ms(start); + return _SUCCESS; } =20 bool get_beacon_valid_bit(struct adapter *adapter) --=20 2.30.2 From nobody Mon May 11 08:32:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFC58C433F5 for ; Sat, 9 Apr 2022 16:32:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242632AbiDIQem (ORCPT ); Sat, 9 Apr 2022 12:34:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242607AbiDIQe3 (ORCPT ); Sat, 9 Apr 2022 12:34:29 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D89E23EC7C for ; Sat, 9 Apr 2022 09:32:22 -0700 (PDT) Received: from ipservice-092-217-091-111.092.217.pools.vodafone-ip.de ([92.217.91.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1ndE0Y-0006Rg-Tn; Sat, 09 Apr 2022 18:32:19 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 02/10] staging: r8188eu: remove unnecessary rtw_get_passing_time_ms call Date: Sat, 9 Apr 2022 18:32:04 +0200 Message-Id: <20220409163212.241122-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220409163212.241122-1-martin@kaiser.cx> References: <20220409163212.241122-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove the rtw_get_passing_time_ms call in send_beacon. Calling rtw_get_passing_time_ms makes no sense if we discard the result. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index babadfc279bc..d85f2182b816 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5751,8 +5751,6 @@ unsigned int send_beacon(struct adapter *padapter) int issue =3D 0; int poll =3D 0; =20 - u32 start =3D jiffies; - clear_beacon_valid_bit(padapter); =20 do { @@ -5770,7 +5768,6 @@ unsigned int send_beacon(struct adapter *padapter) if (!bxmitok) return _FAIL; =20 - rtw_get_passing_time_ms(start); return _SUCCESS; } =20 --=20 2.30.2 From nobody Mon May 11 08:32:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D63AC433EF for ; Sat, 9 Apr 2022 16:32:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242654AbiDIQet (ORCPT ); Sat, 9 Apr 2022 12:34:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242611AbiDIQeb (ORCPT ); Sat, 9 Apr 2022 12:34:31 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B819F23EC77 for ; Sat, 9 Apr 2022 09:32:23 -0700 (PDT) Received: from ipservice-092-217-091-111.092.217.pools.vodafone-ip.de ([92.217.91.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1ndE0Z-0006Rg-Ss; Sat, 09 Apr 2022 18:32:20 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 03/10] staging: r8188eu: summarize two if statements Date: Sat, 9 Apr 2022 18:32:05 +0200 Message-Id: <20220409163212.241122-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220409163212.241122-1-martin@kaiser.cx> References: <20220409163212.241122-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Summarize the two if statements at the end of send_beacon. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index d85f2182b816..2deb92e5a00a 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5763,9 +5763,7 @@ unsigned int send_beacon(struct adapter *padapter) } while ((poll % 10) !=3D 0 && !bxmitok && !padapter->bSurpriseRemoved &= & !padapter->bDriverStopped); } while (!bxmitok && issue < 100 && !padapter->bSurpriseRemoved && !padap= ter->bDriverStopped); =20 - if (padapter->bSurpriseRemoved || padapter->bDriverStopped) - return _FAIL; - if (!bxmitok) + if (padapter->bSurpriseRemoved || padapter->bDriverStopped || !bxmitok) return _FAIL; =20 return _SUCCESS; --=20 2.30.2 From nobody Mon May 11 08:32:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B669C433F5 for ; Sat, 9 Apr 2022 16:32:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242661AbiDIQfC (ORCPT ); Sat, 9 Apr 2022 12:35:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242614AbiDIQed (ORCPT ); Sat, 9 Apr 2022 12:34:33 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4CD623F383 for ; Sat, 9 Apr 2022 09:32:25 -0700 (PDT) Received: from ipservice-092-217-091-111.092.217.pools.vodafone-ip.de ([92.217.91.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1ndE0a-0006Rg-S7; Sat, 09 Apr 2022 18:32:20 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 04/10] staging: r8188eu: improve timeout handling in rtl8188e_firmware_download Date: Sat, 9 Apr 2022 18:32:06 +0200 Message-Id: <20220409163212.241122-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220409163212.241122-1-martin@kaiser.cx> References: <20220409163212.241122-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the standard kernel functions to define and check the timeout in rtl8188e_firmware_download. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_fw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 625d186c3647..7a0997b9bac5 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -247,7 +247,7 @@ int rtl8188e_firmware_download(struct adapter *padapter) { int ret =3D _SUCCESS; u8 write_fw_retry =3D 0; - u32 fwdl_start_time; + unsigned long fwdl_timeout; struct dvobj_priv *dvobj =3D adapter_to_dvobj(padapter); struct device *device =3D dvobj_to_dev(dvobj); struct rt_firmware_hdr *fwhdr =3D NULL; @@ -290,7 +290,7 @@ int rtl8188e_firmware_download(struct adapter *padapter) } =20 fw_download_enable(padapter, true); - fwdl_start_time =3D jiffies; + fwdl_timeout =3D jiffies + msecs_to_jiffies(500); while (1) { /* reset the FWDL chksum */ rtw_write8(padapter, REG_MCUFWDL, rtw_read8(padapter, REG_MCUFWDL) | FWD= L_CHKSUM_RPT); @@ -298,7 +298,7 @@ int rtl8188e_firmware_download(struct adapter *padapter) ret =3D write_fw(padapter, fw_data, fw_size); =20 if (ret =3D=3D _SUCCESS || - (rtw_get_passing_time_ms(fwdl_start_time) > 500 && write_fw_retry++ = >=3D 3)) + (time_after(jiffies, fwdl_timeout) && write_fw_retry++ >=3D 3)) break; } fw_download_enable(padapter, false); --=20 2.30.2 From nobody Mon May 11 08:32:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2111FC433F5 for ; Sat, 9 Apr 2022 16:32:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242666AbiDIQez (ORCPT ); Sat, 9 Apr 2022 12:34:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242616AbiDIQed (ORCPT ); Sat, 9 Apr 2022 12:34:33 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C90C23F386 for ; Sat, 9 Apr 2022 09:32:25 -0700 (PDT) Received: from ipservice-092-217-091-111.092.217.pools.vodafone-ip.de ([92.217.91.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1ndE0b-0006Rg-TY; Sat, 09 Apr 2022 18:32:22 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 05/10] staging: r8188eu: improve timeout handling in rtw_check_join_candidate Date: Sat, 9 Apr 2022 18:32:07 +0200 Message-Id: <20220409163212.241122-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220409163212.241122-1-martin@kaiser.cx> References: <20220409163212.241122-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the standard kernel functions to define and check the timeout in rtw_check_join_candidate. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_mlme.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index c90f36dee1ea..aa39f07847c2 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -1419,6 +1419,7 @@ static int rtw_check_join_candidate(struct mlme_priv = *pmlmepriv { int updated =3D false; struct adapter *adapter =3D container_of(pmlmepriv, struct adapter, mlmep= riv); + unsigned long scan_res_expire; =20 /* check bssid, if needed */ if (pmlmepriv->assoc_by_bssid) { @@ -1436,8 +1437,9 @@ static int rtw_check_join_candidate(struct mlme_priv = *pmlmepriv if (!rtw_is_desired_network(adapter, competitor)) goto exit; =20 + scan_res_expire =3D competitor->last_scanned + msecs_to_jiffies(RTW_SCAN_= RESULT_EXPIRE); if (rtw_to_roaming(adapter) > 0) { - if (rtw_get_passing_time_ms((u32)competitor->last_scanned) >=3D RTW_SCAN= _RESULT_EXPIRE || + if (time_after(jiffies, scan_res_expire) || !is_same_ess(&competitor->network, &pmlmepriv->cur_network.network)) goto exit; } --=20 2.30.2 From nobody Mon May 11 08:32:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83E64C433EF for ; Sat, 9 Apr 2022 16:33:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242665AbiDIQfM (ORCPT ); Sat, 9 Apr 2022 12:35:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242617AbiDIQed (ORCPT ); Sat, 9 Apr 2022 12:34:33 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CB4A23F391 for ; Sat, 9 Apr 2022 09:32:26 -0700 (PDT) Received: from ipservice-092-217-091-111.092.217.pools.vodafone-ip.de ([92.217.91.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1ndE0c-0006Rg-TS; Sat, 09 Apr 2022 18:32:23 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 06/10] staging: r8188eu: make LPS_RF_ON_check static Date: Sat, 9 Apr 2022 18:32:08 +0200 Message-Id: <20220409163212.241122-7-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220409163212.241122-1-martin@kaiser.cx> References: <20220409163212.241122-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" LPS_RF_ON_check is used only in rtw_pwrctrl.c. Make it a static function. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_pwrctrl.c | 2 +- drivers/staging/r8188eu/include/rtw_pwrctrl.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_pwrctrl.c b/drivers/staging/r= 8188eu/core/rtw_pwrctrl.c index 093794414d67..ffafeb7f9c47 100644 --- a/drivers/staging/r8188eu/core/rtw_pwrctrl.c +++ b/drivers/staging/r8188eu/core/rtw_pwrctrl.c @@ -237,7 +237,7 @@ static bool lps_rf_on(struct adapter *adapter) * -1: Timeout * -2: Other error */ -s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms) +static s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms) { u32 start_time; s32 err =3D 0; diff --git a/drivers/staging/r8188eu/include/rtw_pwrctrl.h b/drivers/stagin= g/r8188eu/include/rtw_pwrctrl.h index a5bc2f276024..4324e41780e9 100644 --- a/drivers/staging/r8188eu/include/rtw_pwrctrl.h +++ b/drivers/staging/r8188eu/include/rtw_pwrctrl.h @@ -103,7 +103,6 @@ int ips_leave(struct adapter *padapter); =20 void rtw_ps_processor(struct adapter *padapter); =20 -s32 LPS_RF_ON_check(struct adapter *adapter, u32 delay_ms); void LPS_Enter(struct adapter *adapter); void LPS_Leave(struct adapter *adapter); =20 --=20 2.30.2 From nobody Mon May 11 08:32:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81364C433EF for ; Sat, 9 Apr 2022 16:33:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242689AbiDIQf3 (ORCPT ); Sat, 9 Apr 2022 12:35:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242624AbiDIQef (ORCPT ); Sat, 9 Apr 2022 12:34:35 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 695A823F386 for ; Sat, 9 Apr 2022 09:32:28 -0700 (PDT) Received: from ipservice-092-217-091-111.092.217.pools.vodafone-ip.de ([92.217.91.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1ndE0d-0006Rg-SG; Sat, 09 Apr 2022 18:32:23 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 07/10] staging: r8188eu: improve timeout handling in LPS_RF_ON_check Date: Sat, 9 Apr 2022 18:32:09 +0200 Message-Id: <20220409163212.241122-8-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220409163212.241122-1-martin@kaiser.cx> References: <20220409163212.241122-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the standard kernel functions to define and check the timeout in LPS_RF_ON_check. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_pwrctrl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_pwrctrl.c b/drivers/staging/r= 8188eu/core/rtw_pwrctrl.c index ffafeb7f9c47..1aebf9400f12 100644 --- a/drivers/staging/r8188eu/core/rtw_pwrctrl.c +++ b/drivers/staging/r8188eu/core/rtw_pwrctrl.c @@ -239,10 +239,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 =3D jiffies + msecs_to_jiffies(delay_ms); s32 err =3D 0; =20 - start_time =3D jiffies; while (1) { if (lps_rf_on(padapter)) break; @@ -252,7 +251,7 @@ static s32 LPS_RF_ON_check(struct adapter *padapter, u3= 2 delay_ms) break; } =20 - if (rtw_get_passing_time_ms(start_time) > delay_ms) { + if (time_after(jiffies, timeout)) { err =3D -1; break; } --=20 2.30.2 From nobody Mon May 11 08:32:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9B68C433EF for ; Sat, 9 Apr 2022 16:33:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242642AbiDIQfW (ORCPT ); Sat, 9 Apr 2022 12:35:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242623AbiDIQef (ORCPT ); Sat, 9 Apr 2022 12:34:35 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A76323F383 for ; Sat, 9 Apr 2022 09:32:28 -0700 (PDT) Received: from ipservice-092-217-091-111.092.217.pools.vodafone-ip.de ([92.217.91.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1ndE0e-0006Rg-QC; Sat, 09 Apr 2022 18:32:24 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 08/10] staging: r8188eu: improve timeout handling in iol_execute Date: Sat, 9 Apr 2022 18:32:10 +0200 Message-Id: <20220409163212.241122-9-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220409163212.241122-1-martin@kaiser.cx> References: <20220409163212.241122-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the standard kernel functions to define and check the timeout in iol_execute. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/stag= ing/r8188eu/hal/rtl8188e_hal_init.c index 609138887b25..efdadfb61905 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c @@ -33,17 +33,16 @@ static s32 iol_execute(struct adapter *padapter, u8 con= trol) { s32 status =3D _FAIL; u8 reg_0x88 =3D 0; - u32 start =3D 0, passing_time =3D 0; + unsigned long timeout; =20 control =3D control & 0x0f; reg_0x88 =3D rtw_read8(padapter, REG_HMEBOX_E0); rtw_write8(padapter, REG_HMEBOX_E0, reg_0x88 | control); =20 - start =3D jiffies; + timeout =3D jiffies + msecs_to_jiffies(1000); while ((reg_0x88 =3D rtw_read8(padapter, REG_HMEBOX_E0)) & control && - (passing_time =3D rtw_get_passing_time_ms(start)) < 1000) { + time_before(jiffies, timeout)) ; - } =20 reg_0x88 =3D rtw_read8(padapter, REG_HMEBOX_E0); status =3D (reg_0x88 & control) ? _FAIL : _SUCCESS; --=20 2.30.2 From nobody Mon May 11 08:32:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EEAEC433F5 for ; Sat, 9 Apr 2022 16:33:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242695AbiDIQfZ (ORCPT ); Sat, 9 Apr 2022 12:35:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242626AbiDIQeh (ORCPT ); Sat, 9 Apr 2022 12:34:37 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5490823EC77 for ; Sat, 9 Apr 2022 09:32:29 -0700 (PDT) Received: from ipservice-092-217-091-111.092.217.pools.vodafone-ip.de ([92.217.91.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1ndE0f-0006Rg-Oy; Sat, 09 Apr 2022 18:32:25 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 09/10] staging: r8188eu: improve timeout handling in efuse_read_phymap_from_txpktbuf Date: Sat, 9 Apr 2022 18:32:11 +0200 Message-Id: <20220409163212.241122-10-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220409163212.241122-1-martin@kaiser.cx> References: <20220409163212.241122-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the standard kernel functions to define and check the timeout in efuse_read_phymap_from_txpktbuf. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/stag= ing/r8188eu/hal/rtl8188e_hal_init.c index efdadfb61905..e17375a74f17 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c @@ -186,8 +186,8 @@ static void efuse_read_phymap_from_txpktbuf( u16 *size /* for efuse content: the max byte to read. will update to byte= read */ ) { + unsigned long timeout; u16 dbg_addr =3D 0; - u32 start =3D 0, passing_time =3D 0; __le32 lo32 =3D 0, hi32 =3D 0; u16 len =3D 0, count =3D 0; int i =3D 0; @@ -206,9 +206,8 @@ static void efuse_read_phymap_from_txpktbuf( rtw_write16(adapter, REG_PKTBUF_DBG_ADDR, dbg_addr + i); =20 rtw_write8(adapter, REG_TXPKTBUF_DBG, 0); - start =3D jiffies; - while (!rtw_read8(adapter, REG_TXPKTBUF_DBG) && - (passing_time =3D rtw_get_passing_time_ms(start)) < 1000) + timeout =3D jiffies + msecs_to_jiffies(1000); + while (!rtw_read8(adapter, REG_TXPKTBUF_DBG) && time_before(jiffies, tim= eout)) rtw_usleep_os(100); =20 /* data from EEPROM needs to be in LE */ --=20 2.30.2 From nobody Mon May 11 08:32:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F5C8C433F5 for ; Sat, 9 Apr 2022 16:33:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242662AbiDIQfS (ORCPT ); Sat, 9 Apr 2022 12:35:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241904AbiDIQej (ORCPT ); Sat, 9 Apr 2022 12:34:39 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB25223F3B7 for ; Sat, 9 Apr 2022 09:32:30 -0700 (PDT) Received: from ipservice-092-217-091-111.092.217.pools.vodafone-ip.de ([92.217.91.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1ndE0g-0006Rg-RV; Sat, 09 Apr 2022 18:32:26 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 10/10] staging: r8188eu: remove unused timer functions Date: Sat, 9 Apr 2022 18:32:12 +0200 Message-Id: <20220409163212.241122-11-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220409163212.241122-1-martin@kaiser.cx> References: <20220409163212.241122-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" rtw_get_passing_time_ms and rtw_systime_to_ms are not used any more. Remove them. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/osdep_service.h | 3 --- drivers/staging/r8188eu/os_dep/osdep_service.c | 11 ----------- 2 files changed, 14 deletions(-) diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index 1e55a8008acc..f1a703643e74 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -77,9 +77,6 @@ void *rtw_malloc2d(int h, int w, int size); spin_lock_init(&((q)->lock)); \ } while (0) =20 -u32 rtw_systime_to_ms(u32 systime); -s32 rtw_get_passing_time_ms(u32 start); - void rtw_usleep_os(int us); =20 static inline unsigned char _cancel_timer_ex(struct timer_list *ptimer) diff --git a/drivers/staging/r8188eu/os_dep/osdep_service.c b/drivers/stagi= ng/r8188eu/os_dep/osdep_service.c index 7b177d50eee2..812acd59be79 100644 --- a/drivers/staging/r8188eu/os_dep/osdep_service.c +++ b/drivers/staging/r8188eu/os_dep/osdep_service.c @@ -42,17 +42,6 @@ Otherwise, there will be racing condition. Caller must check if the list is empty before calling rtw_list_delete */ =20 -inline u32 rtw_systime_to_ms(u32 systime) -{ - return systime * 1000 / HZ; -} - -/* the input parameter start use the same unit as jiffies */ -inline s32 rtw_get_passing_time_ms(u32 start) -{ - return rtw_systime_to_ms(jiffies - start); -} - void rtw_usleep_os(int us) { if (1 < (us / 1000)) --=20 2.30.2