From nobody Mon Jun 22 15:45: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 9C16EC433EF for ; Mon, 21 Mar 2022 20:34:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353402AbiCUUfg (ORCPT ); Mon, 21 Mar 2022 16:35:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238538AbiCUUfY (ORCPT ); Mon, 21 Mar 2022 16:35:24 -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 618753E0ED for ; Mon, 21 Mar 2022 13:33:58 -0700 (PDT) Received: from dslb-094-219-034-255.094.219.pools.vodafone-ip.de ([94.219.34.255] 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 1nWOiw-0003ce-QD; Mon, 21 Mar 2022 21:33:54 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, David Laight , Martin Kaiser Subject: [PATCH 1/6] staging: r8188eu: remove two limit defines Date: Mon, 21 Mar 2022 21:30:26 +0100 Message-Id: <20220321203031.143486-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220321203031.143486-1-martin@kaiser.cx> References: <20220321203031.143486-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 two unused defines related to limits. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 0c555ea6719b..752fa433544e 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -24,9 +24,6 @@ =20 #define REAUTH_LIMIT (4) #define REASSOC_LIMIT (4) -#define READDBA_LIMIT (2) - -#define ROAMING_LIMIT 8 =20 #define DYNAMIC_FUNC_DISABLE (0x0) =20 --=20 2.30.2 From nobody Mon Jun 22 15:45: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 BE0BFC433EF for ; Mon, 21 Mar 2022 20:34:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353400AbiCUUfj (ORCPT ); Mon, 21 Mar 2022 16:35:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353373AbiCUUfZ (ORCPT ); Mon, 21 Mar 2022 16:35:25 -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 9B2DF3E5E9 for ; Mon, 21 Mar 2022 13:33:59 -0700 (PDT) Received: from dslb-094-219-034-255.094.219.pools.vodafone-ip.de ([94.219.34.255] 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 1nWOix-0003ce-NR; Mon, 21 Mar 2022 21:33:55 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, David Laight , Martin Kaiser Subject: [PATCH 2/6] staging: r8188eu: remove unused defines for dynamic functions Date: Mon, 21 Mar 2022 21:30:27 +0100 Message-Id: <20220321203031.143486-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220321203031.143486-1-martin@kaiser.cx> References: <20220321203031.143486-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 a couple of DYNAMIC_BB_... defines which are not used by this driver. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 752fa433544e..532360c84d66 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -30,26 +30,10 @@ /* =3D=3D=3D=3D=3D=3D ODM_ABILITY_E =3D=3D=3D=3D=3D=3D=3D=3D */ /* BB ODM section BIT 0-15 */ #define DYNAMIC_BB_DIG BIT(0) -#define DYNAMIC_BB_RA_MASK BIT(1) #define DYNAMIC_BB_DYNAMIC_TXPWR BIT(2) -#define DYNAMIC_BB_BB_FA_CNT BIT(3) =20 -#define DYNAMIC_BB_RSSI_MONITOR BIT(4) -#define DYNAMIC_BB_CCK_PD BIT(5) #define DYNAMIC_BB_ANT_DIV BIT(6) -#define DYNAMIC_BB_PWR_SAVE BIT(7) -#define DYNAMIC_BB_PWR_TRA BIT(8) -#define DYNAMIC_BB_RATE_ADAPTIVE BIT(9) -#define DYNAMIC_BB_PATH_DIV BIT(10) -#define DYNAMIC_BB_PSD BIT(11) - -/* MAC DM section BIT 16-23 */ -#define DYNAMIC_MAC_EDCA_TURBO BIT(16) -#define DYNAMIC_MAC_EARLY_MODE BIT(17) - -/* RF ODM section BIT 24-31 */ -#define DYNAMIC_RF_TX_PWR_TRACK BIT(24) -#define DYNAMIC_RF_RX_GAIN_TRACK BIT(25) + #define DYNAMIC_RF_CALIBRATION BIT(26) =20 #define DYNAMIC_ALL_FUNC_ENABLE 0xFFFFFFF --=20 2.30.2 From nobody Mon Jun 22 15:45: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 1071DC433EF for ; Mon, 21 Mar 2022 20:34:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353420AbiCUUfk (ORCPT ); Mon, 21 Mar 2022 16:35:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353378AbiCUUf1 (ORCPT ); Mon, 21 Mar 2022 16:35:27 -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 68BF03EB86 for ; Mon, 21 Mar 2022 13:34:00 -0700 (PDT) Received: from dslb-094-219-034-255.094.219.pools.vodafone-ip.de ([94.219.34.255] 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 1nWOiy-0003ce-ID; Mon, 21 Mar 2022 21:33:56 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, David Laight , Martin Kaiser Subject: [PATCH 3/6] staging: r8188eu: DYNAMIC_BB_DYNAMIC_TXPWR is not used Date: Mon, 21 Mar 2022 21:30:28 +0100 Message-Id: <20220321203031.143486-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220321203031.143486-1-martin@kaiser.cx> References: <20220321203031.143486-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 DYNAMIC_BB_DYNAMIC_TXPWR capability. It is cleared but not used. DYNAMIC_BB_DYNAMIC_TXPWR defines a bit in podmpriv->SupportAbility that's set or cleared. There's no code that checks this bit explicitly. There's also no code that makes a copy of SupportAbility and checks the DYNAMIC_BB_DYNAMIC_TXPWR in the copy. SupportAbility is copied to podmpriv->BK_SupportAbility. The only use of BK_SupportAbility is to restore a previously saved value. The other remaining reader of SupportAbility is a private debug ioctl. It's safe to assume that DYNAMIC_BB_DYNAMIC_TXPWR is not used, not even indirectly. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 4 ---- drivers/staging/r8188eu/hal/usb_halinit.c | 2 -- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 1 - 3 files changed, 7 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index f32401deae9a..2d495a756abf 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -1275,14 +1275,10 @@ void update_IOT_info(struct adapter *padapter) case HT_IOT_PEER_RALINK: pmlmeinfo->turboMode_cts2self =3D 0; pmlmeinfo->turboMode_rtsen =3D 1; - /* disable high power */ - Switch_DM_Func(padapter, (u32)(~DYNAMIC_BB_DYNAMIC_TXPWR), false); break; case HT_IOT_PEER_REALTEK: /* rtw_write16(padapter, 0x4cc, 0xffff); */ /* rtw_write16(padapter, 0x546, 0x01c0); */ - /* disable high power */ - Switch_DM_Func(padapter, (u32)(~DYNAMIC_BB_DYNAMIC_TXPWR), false); break; default: pmlmeinfo->turboMode_cts2self =3D 0; diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index a92774352d2d..dda8715beb07 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1431,8 +1431,6 @@ void SetHalDefVar8188EUsb(struct adapter *Adapter, en= um hal_def_variable eVariab podmpriv->SupportAbility =3D DYNAMIC_FUNC_DISABLE; } else if (dm_func =3D=3D 1) {/* disable DIG */ podmpriv->SupportAbility &=3D (~DYNAMIC_BB_DIG); - } else if (dm_func =3D=3D 2) {/* disable High power */ - podmpriv->SupportAbility &=3D (~DYNAMIC_BB_DYNAMIC_TXPWR); } else if (dm_func =3D=3D 3) {/* disable tx power tracking */ podmpriv->SupportAbility &=3D (~DYNAMIC_RF_CALIBRATION); } else if (dm_func =3D=3D 5) {/* disable antenna diversity */ diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 532360c84d66..703fb9f2409d 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -30,7 +30,6 @@ /* =3D=3D=3D=3D=3D=3D ODM_ABILITY_E =3D=3D=3D=3D=3D=3D=3D=3D */ /* BB ODM section BIT 0-15 */ #define DYNAMIC_BB_DIG BIT(0) -#define DYNAMIC_BB_DYNAMIC_TXPWR BIT(2) =20 #define DYNAMIC_BB_ANT_DIV BIT(6) =20 --=20 2.30.2 From nobody Mon Jun 22 15:45: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 91F38C433F5 for ; Mon, 21 Mar 2022 20:34:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353427AbiCUUfn (ORCPT ); Mon, 21 Mar 2022 16:35:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353376AbiCUUf1 (ORCPT ); Mon, 21 Mar 2022 16:35:27 -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 8DF353E5E9 for ; Mon, 21 Mar 2022 13:34:01 -0700 (PDT) Received: from dslb-094-219-034-255.094.219.pools.vodafone-ip.de ([94.219.34.255] 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 1nWOiz-0003ce-Bh; Mon, 21 Mar 2022 21:33:57 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, David Laight , Martin Kaiser Subject: [PATCH 4/6] staging: r8188eu: DYNAMIC_BB_ANT_DIV is not used Date: Mon, 21 Mar 2022 21:30:29 +0100 Message-Id: <20220321203031.143486-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220321203031.143486-1-martin@kaiser.cx> References: <20220321203031.143486-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 DYNAMIC_BB_ANT_DIV capability. It's cleared in one place but never checked. DYNAMIC_BB_ANT_DIV is part of podmpriv->SupportAbility, there are no users that check SupportAbility as a whole and use DYNAMIC_BB_ANT_DIV implicitly. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/usb_halinit.c | 2 -- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index dda8715beb07..599d930a5927 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1433,8 +1433,6 @@ void SetHalDefVar8188EUsb(struct adapter *Adapter, en= um hal_def_variable eVariab podmpriv->SupportAbility &=3D (~DYNAMIC_BB_DIG); } else if (dm_func =3D=3D 3) {/* disable tx power tracking */ podmpriv->SupportAbility &=3D (~DYNAMIC_RF_CALIBRATION); - } else if (dm_func =3D=3D 5) {/* disable antenna diversity */ - podmpriv->SupportAbility &=3D (~DYNAMIC_BB_ANT_DIV); } else if (dm_func =3D=3D 6) {/* turn on all dynamic func */ if (!(podmpriv->SupportAbility & DYNAMIC_BB_DIG)) { struct rtw_dig *pDigTable =3D &podmpriv->DM_DigTable; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 703fb9f2409d..9b9c81fe8543 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -31,8 +31,6 @@ /* BB ODM section BIT 0-15 */ #define DYNAMIC_BB_DIG BIT(0) =20 -#define DYNAMIC_BB_ANT_DIV BIT(6) - #define DYNAMIC_RF_CALIBRATION BIT(26) =20 #define DYNAMIC_ALL_FUNC_ENABLE 0xFFFFFFF --=20 2.30.2 From nobody Mon Jun 22 15:45: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 4A403C433EF for ; Mon, 21 Mar 2022 20:34:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353449AbiCUUfr (ORCPT ); Mon, 21 Mar 2022 16:35:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353372AbiCUUf1 (ORCPT ); Mon, 21 Mar 2022 16:35:27 -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 1B3793EB8B for ; Mon, 21 Mar 2022 13:34:02 -0700 (PDT) Received: from dslb-094-219-034-255.094.219.pools.vodafone-ip.de ([94.219.34.255] 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 1nWOj0-0003ce-6c; Mon, 21 Mar 2022 21:33:58 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, David Laight , Martin Kaiser Subject: [PATCH 5/6] staging: r8188eu: DYNAMIC_RF_CALIBRATION is not used Date: Mon, 21 Mar 2022 21:30:30 +0100 Message-Id: <20220321203031.143486-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220321203031.143486-1-martin@kaiser.cx> References: <20220321203031.143486-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 DYNAMIC_RF_CALIBRATION capability. It's cleared in one place but never checked. DYNAMIC_RF_CALIBRATION is part of podmpriv->SupportAbility, there are no users that check SupportAbility as a whole and use DYNAMIC_RF_CALIBRATION implicitly. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/usb_halinit.c | 2 -- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 599d930a5927..11dc8834acac 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1431,8 +1431,6 @@ void SetHalDefVar8188EUsb(struct adapter *Adapter, en= um hal_def_variable eVariab podmpriv->SupportAbility =3D DYNAMIC_FUNC_DISABLE; } else if (dm_func =3D=3D 1) {/* disable DIG */ podmpriv->SupportAbility &=3D (~DYNAMIC_BB_DIG); - } else if (dm_func =3D=3D 3) {/* disable tx power tracking */ - podmpriv->SupportAbility &=3D (~DYNAMIC_RF_CALIBRATION); } else if (dm_func =3D=3D 6) {/* turn on all dynamic func */ if (!(podmpriv->SupportAbility & DYNAMIC_BB_DIG)) { struct rtw_dig *pDigTable =3D &podmpriv->DM_DigTable; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 9b9c81fe8543..9092e775fc5d 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -31,8 +31,6 @@ /* BB ODM section BIT 0-15 */ #define DYNAMIC_BB_DIG BIT(0) =20 -#define DYNAMIC_RF_CALIBRATION BIT(26) - #define DYNAMIC_ALL_FUNC_ENABLE 0xFFFFFFF =20 #define _HW_STATE_NOLINK_ 0x00 --=20 2.30.2 From nobody Mon Jun 22 15:45: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 17B1EC433EF for ; Mon, 21 Mar 2022 20:34:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353431AbiCUUfx (ORCPT ); Mon, 21 Mar 2022 16:35:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353386AbiCUUf2 (ORCPT ); Mon, 21 Mar 2022 16:35:28 -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 18DD13EBB8 for ; Mon, 21 Mar 2022 13:34:03 -0700 (PDT) Received: from dslb-094-219-034-255.094.219.pools.vodafone-ip.de ([94.219.34.255] 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 1nWOj1-0003ce-7M; Mon, 21 Mar 2022 21:33:59 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, David Laight , Martin Kaiser Subject: [PATCH 6/6] staging: r8188eu: refactor dm func set and clear Date: Mon, 21 Mar 2022 21:30:31 +0100 Message-Id: <20220321203031.143486-7-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220321203031.143486-1-martin@kaiser.cx> References: <20220321203031.143486-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" Refactor the code to set and clear "dm functions". The only remaining callers of Switch_DM_Func use Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true) or Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false). Remove Switch_DM_Func and call SetHwReg8188EU directly. For HW_VAR_DM_FUNC_SET, the parameter is always DYNAMIC_ALL_FUNC_ENABLE. This operation resets podmpriv->SupportAbility to the initial value. Rename HW_VAR_DM_FUNC_SET to HW_VAR_DM_FUNC_RESET and drop the unused else branch. For HW_VAR_DM_FUNC_CLR, the parameter is always DYNAMIC_FUNC_DISABLE (0x00). We can set podmpriv->SupportAbility to 0 directly. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 6 +++--- drivers/staging/r8188eu/core/rtw_wlan_util.c | 8 -------- drivers/staging/r8188eu/hal/usb_halinit.c | 10 +++------- drivers/staging/r8188eu/include/hal_intf.h | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 1 - 5 files changed, 7 insertions(+), 20 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 10d5f1222936..96e8d346588b 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -6721,7 +6721,7 @@ void mlmeext_joinbss_event_callback(struct adapter *p= adapter, int join_res) } =20 /* turn on dynamic functions */ - Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true); + SetHwReg8188EU(padapter, HW_VAR_DM_FUNC_RESET, NULL); =20 /* update IOT-releated issue */ update_IOT_info(padapter); @@ -7122,7 +7122,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf) =20 /* disable dynamic functions, such as high power, DIG */ Save_DM_Func_Flag(padapter); - Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false); + SetHwReg8188EU(padapter, HW_VAR_DM_FUNC_CLR, NULL); =20 /* cancel link timer */ _cancel_timer_ex(&pmlmeext->link_timer); @@ -7391,7 +7391,7 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *p= buf) if ((pmlmeext->sitesurvey_res.state =3D=3D SCAN_START) || (pmlmeext->site= survey_res.state =3D=3D SCAN_TXNULL)) { /* disable dynamic functions, such as high power, DIG */ Save_DM_Func_Flag(padapter); - Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false); + SetHwReg8188EU(padapter, HW_VAR_DM_FUNC_CLR, NULL); =20 /* config the initial gain under scanning, need to write the BB register= s */ if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index 2d495a756abf..5a1eede57458 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -276,14 +276,6 @@ void Restore_DM_Func_Flag(struct adapter *padapter) SetHwReg8188EU(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&saveflag)); } =20 -void Switch_DM_Func(struct adapter *padapter, u32 mode, u8 enable) -{ - if (enable) - SetHwReg8188EU(padapter, HW_VAR_DM_FUNC_SET, (u8 *)(&mode)); - else - SetHwReg8188EU(padapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode)); -} - void Set_MSR(struct adapter *padapter, u8 type) { u8 val8; diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 11dc8834acac..789ad11170b2 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1148,15 +1148,11 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 var= iable, u8 *val) else podmpriv->SupportAbility =3D podmpriv->BK_SupportAbility; break; - case HW_VAR_DM_FUNC_SET: - if (*((u32 *)val) =3D=3D DYNAMIC_ALL_FUNC_ENABLE) { - podmpriv->SupportAbility =3D pdmpriv->InitODMFlag; - } else { - podmpriv->SupportAbility |=3D *((u32 *)val); - } + case HW_VAR_DM_FUNC_RESET: + podmpriv->SupportAbility =3D pdmpriv->InitODMFlag; break; case HW_VAR_DM_FUNC_CLR: - podmpriv->SupportAbility &=3D *((u32 *)val); + podmpriv->SupportAbility =3D 0; break; case HW_VAR_AC_PARAM_BE: haldata->AcParam_BE =3D ((u32 *)(val))[0]; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 3cededa4dcfc..6f661c4af358 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -22,7 +22,7 @@ enum hw_variables { HW_VAR_BCN_VALID, HW_VAR_DM_FLAG, HW_VAR_DM_FUNC_OP, - HW_VAR_DM_FUNC_SET, + HW_VAR_DM_FUNC_RESET, HW_VAR_DM_FUNC_CLR, HW_VAR_AC_PARAM_BE, HW_VAR_ACM_CTRL, diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 9092e775fc5d..3dde2bd0d77a 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -410,7 +410,6 @@ void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssrat= elen); =20 void Save_DM_Func_Flag(struct adapter *padapter); void Restore_DM_Func_Flag(struct adapter *padapter); -void Switch_DM_Func(struct adapter *padapter, u32 mode, u8 enable); =20 void Set_MSR(struct adapter *padapter, u8 type); =20 --=20 2.30.2