From nobody Mon Jun 29 17:36:50 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 A73E0C433EF for ; Sat, 5 Feb 2022 11:38:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346964AbiBELh5 (ORCPT ); Sat, 5 Feb 2022 06:37:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243390AbiBELhy (ORCPT ); Sat, 5 Feb 2022 06:37:54 -0500 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 A753BC061346 for ; Sat, 5 Feb 2022 03:37:53 -0800 (PST) Received: from dslb-188-104-059-100.188.104.pools.vodafone-ip.de ([188.104.59.100] 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 1nGJO0-0005c9-3v; Sat, 05 Feb 2022 12:37:48 +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, Martin Kaiser Subject: [PATCH 1/8] staging: r8188eu: TXPowercount is set but not used Date: Sat, 5 Feb 2022 12:37:34 +0100 Message-Id: <20220205113741.379070-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220205113741.379070-1-martin@kaiser.cx> References: <20220205113741.379070-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" TXPowercount in struct odm_rf_cal is set but not used. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 1 - drivers/staging/r8188eu/hal/odm.c | 1 - drivers/staging/r8188eu/include/odm.h | 1 - 3 files changed, 3 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging= /r8188eu/hal/HalPhyRf_8188e.c index 795320e13e55..f0f26eecb2c0 100644 --- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c @@ -285,7 +285,6 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( if (dm_odm->RFCalibrateInfo.TxPowerTrackControl) dm_odm->RFCalibrateInfo.ThermalValue =3D ThermalValue; } - dm_odm->RFCalibrateInfo.TXPowercount =3D 0; } =20 /* 1 7. IQK */ diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/ha= l/odm.c index 9b4b75c225a7..117cdf2e5180 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -506,7 +506,6 @@ static void odm_RSSIMonitorCheck(struct odm_dm_struct *= pDM_Odm) static void odm_TXPowerTrackingThermalMeterInit(struct odm_dm_struct *pDM_= Odm) { pDM_Odm->RFCalibrateInfo.bTXPowerTracking =3D true; - pDM_Odm->RFCalibrateInfo.TXPowercount =3D 0; pDM_Odm->RFCalibrateInfo.bTXPowerTrackingInit =3D false; pDM_Odm->RFCalibrateInfo.TxPowerTrackControl =3D true; } diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 63e0b6725bee..046a4b9e0899 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -229,7 +229,6 @@ struct odm_rf_cal { s32 RegEB4; s32 RegEBC; =20 - u8 TXPowercount; bool bTXPowerTrackingInit; bool bTXPowerTracking; u8 TxPowerTrackControl; /* for mp mode, turn off txpwrtracking --=20 2.30.2 From nobody Mon Jun 29 17:36:50 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 35FC7C433F5 for ; Sat, 5 Feb 2022 11:37:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344284AbiBELh4 (ORCPT ); Sat, 5 Feb 2022 06:37:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234257AbiBELhy (ORCPT ); Sat, 5 Feb 2022 06:37:54 -0500 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 BC8F8C061347 for ; Sat, 5 Feb 2022 03:37:53 -0800 (PST) Received: from dslb-188-104-059-100.188.104.pools.vodafone-ip.de ([188.104.59.100] 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 1nGJO1-0005c9-4w; Sat, 05 Feb 2022 12:37:49 +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, Martin Kaiser Subject: [PATCH 2/8] staging: r8188eu: TXPowerTrackingCallbackCnt is set but not used Date: Sat, 5 Feb 2022 12:37:35 +0100 Message-Id: <20220205113741.379070-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220205113741.379070-1-martin@kaiser.cx> References: <20220205113741.379070-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" TXPowerTrackingCallbackCnt in struct odm_rf_cal is set but not used. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 1 - drivers/staging/r8188eu/include/odm.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging= /r8188eu/hal/HalPhyRf_8188e.c index f0f26eecb2c0..2ce777ac041a 100644 --- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c @@ -129,7 +129,6 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( /* 2012/04/25 MH Add for tx power tracking to set tx power in tx agc for= 88E. */ odm_TxPwrTrackSetPwr88E(dm_odm); =20 - dm_odm->RFCalibrateInfo.TXPowerTrackingCallbackCnt++; /* cosa add for deb= ug */ dm_odm->RFCalibrateInfo.bTXPowerTrackingInit =3D true; =20 /* RFCalibrateInfo.RegA24 will be initialized when ODM HW confi= guring, but MP configures with para files. */ diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 046a4b9e0899..2844ca96d3ba 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -253,7 +253,6 @@ struct odm_rf_cal { =20 bool bReloadtxpowerindex; u8 bRfPiEnable; - u32 TXPowerTrackingCallbackCnt; /* cosa add for debug */ =20 u8 bCCKinCH14; u8 CCK_index; --=20 2.30.2 From nobody Mon Jun 29 17:36:50 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 D5088C433FE for ; Sat, 5 Feb 2022 11:38:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355816AbiBELiD (ORCPT ); Sat, 5 Feb 2022 06:38:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343636AbiBELhz (ORCPT ); Sat, 5 Feb 2022 06:37:55 -0500 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 C77F5C061353 for ; Sat, 5 Feb 2022 03:37:53 -0800 (PST) Received: from dslb-188-104-059-100.188.104.pools.vodafone-ip.de ([188.104.59.100] 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 1nGJO2-0005c9-22; Sat, 05 Feb 2022 12:37:50 +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, Martin Kaiser Subject: [PATCH 3/8] staging: r8188eu: bTXPowerTrackingInit is set but not used Date: Sat, 5 Feb 2022 12:37:36 +0100 Message-Id: <20220205113741.379070-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220205113741.379070-1-martin@kaiser.cx> References: <20220205113741.379070-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" bTXPowerTrackingInit in struct odm_rf_cal is set but not used. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 2 -- drivers/staging/r8188eu/hal/odm.c | 1 - drivers/staging/r8188eu/include/odm.h | 1 - 3 files changed, 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging= /r8188eu/hal/HalPhyRf_8188e.c index 2ce777ac041a..c26c87e5cb78 100644 --- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c @@ -129,8 +129,6 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( /* 2012/04/25 MH Add for tx power tracking to set tx power in tx agc for= 88E. */ odm_TxPwrTrackSetPwr88E(dm_odm); =20 - dm_odm->RFCalibrateInfo.bTXPowerTrackingInit =3D true; - /* RFCalibrateInfo.RegA24 will be initialized when ODM HW confi= guring, but MP configures with para files. */ dm_odm->RFCalibrateInfo.RegA24 =3D 0x090e1317; =20 diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/ha= l/odm.c index 117cdf2e5180..e3bace2e3713 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -506,7 +506,6 @@ static void odm_RSSIMonitorCheck(struct odm_dm_struct *= pDM_Odm) static void odm_TXPowerTrackingThermalMeterInit(struct odm_dm_struct *pDM_= Odm) { pDM_Odm->RFCalibrateInfo.bTXPowerTracking =3D true; - pDM_Odm->RFCalibrateInfo.bTXPowerTrackingInit =3D false; pDM_Odm->RFCalibrateInfo.TxPowerTrackControl =3D true; } =20 diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 2844ca96d3ba..47b347fe1da0 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -229,7 +229,6 @@ struct odm_rf_cal { s32 RegEB4; s32 RegEBC; =20 - bool bTXPowerTrackingInit; bool bTXPowerTracking; u8 TxPowerTrackControl; /* for mp mode, turn off txpwrtracking * as default */ --=20 2.30.2 From nobody Mon Jun 29 17:36:50 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 984C3C433F5 for ; Sat, 5 Feb 2022 11:38:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348807AbiBELh7 (ORCPT ); Sat, 5 Feb 2022 06:37:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344500AbiBELh4 (ORCPT ); Sat, 5 Feb 2022 06:37:56 -0500 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 1E27CC061346 for ; Sat, 5 Feb 2022 03:37:55 -0800 (PST) Received: from dslb-188-104-059-100.188.104.pools.vodafone-ip.de ([188.104.59.100] 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 1nGJO2-0005c9-Tv; Sat, 05 Feb 2022 12:37:50 +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, Martin Kaiser Subject: [PATCH 4/8] staging: r8188eu: bTXPowerTracking is set but not used Date: Sat, 5 Feb 2022 12:37:37 +0100 Message-Id: <20220205113741.379070-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220205113741.379070-1-martin@kaiser.cx> References: <20220205113741.379070-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" bTXPowerTracking in struct odm_rf_cal is set but not used. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm.c | 1 - drivers/staging/r8188eu/include/odm.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/ha= l/odm.c index e3bace2e3713..a759c2fe5d66 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -505,7 +505,6 @@ static void odm_RSSIMonitorCheck(struct odm_dm_struct *= pDM_Odm) =20 static void odm_TXPowerTrackingThermalMeterInit(struct odm_dm_struct *pDM_= Odm) { - pDM_Odm->RFCalibrateInfo.bTXPowerTracking =3D true; pDM_Odm->RFCalibrateInfo.TxPowerTrackControl =3D true; } =20 diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 47b347fe1da0..f7f85ca05bd3 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -229,7 +229,6 @@ struct odm_rf_cal { s32 RegEB4; s32 RegEBC; =20 - bool bTXPowerTracking; u8 TxPowerTrackControl; /* for mp mode, turn off txpwrtracking * as default */ u8 TM_Trigger; --=20 2.30.2 From nobody Mon Jun 29 17:36:50 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 69260C433EF for ; Sat, 5 Feb 2022 11:38:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358043AbiBELiG (ORCPT ); Sat, 5 Feb 2022 06:38:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345131AbiBELh4 (ORCPT ); Sat, 5 Feb 2022 06:37:56 -0500 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 04C72C061347 for ; Sat, 5 Feb 2022 03:37:55 -0800 (PST) Received: from dslb-188-104-059-100.188.104.pools.vodafone-ip.de ([188.104.59.100] 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 1nGJO3-0005c9-Op; Sat, 05 Feb 2022 12:37:51 +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, Martin Kaiser Subject: [PATCH 5/8] staging: r8188eu: remove constant rf variable Date: Sat, 5 Feb 2022 12:37:38 +0100 Message-Id: <20220205113741.379070-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220205113741.379070-1-martin@kaiser.cx> References: <20220205113741.379070-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 rf variable in odm_TXPowerTrackingCallback_ThermalMeter_8188E is always 1. The for loops that use rf will be executed only once. We can remove the variable and the loops. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging= /r8188eu/hal/HalPhyRf_8188e.c index c26c87e5cb78..5df8371a44fb 100644 --- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c @@ -107,7 +107,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( s8 OFDM_index_old[2] =3D {0, 0}, CCK_index_old =3D 0; u32 i =3D 0, j =3D 0; =20 - u8 OFDM_min_index =3D 6, rf; /* OFDM BB Swing should be less than +3.0dB,= which is required by Arthur */ + u8 OFDM_min_index =3D 6; /* OFDM BB Swing should be less than +3.0dB, whi= ch is required by Arthur */ s8 OFDM_index_mapping[2][index_mapping_NUM_88E] =3D { {0, 0, 2, 3, 4, 4, /* 2.4G, decrease power */ 5, 6, 7, 7, 8, 9, @@ -134,8 +134,6 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( =20 ThermalValue =3D (u8)rtl8188e_PHY_QueryRFReg(Adapter, RF_PATH_A, RF_T_MET= ER_88E, 0xfc00); /* 0x42: RF Reg[15:10] 88E */ =20 - rf =3D 1; - if (ThermalValue) { /* Query OFDM path A default setting */ ele_D =3D rtl8188e_PHY_QueryBBReg(Adapter, rOFDM0_XATxIQImbalance, bMask= DWord) & bMaskOFDM_D; @@ -171,8 +169,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( dm_odm->RFCalibrateInfo.ThermalValue_LCK =3D ThermalValue; dm_odm->RFCalibrateInfo.ThermalValue_IQK =3D ThermalValue; =20 - for (i =3D 0; i < rf; i++) - dm_odm->RFCalibrateInfo.OFDM_index[i] =3D OFDM_index_old[i]; + dm_odm->RFCalibrateInfo.OFDM_index[0] =3D OFDM_index_old[0]; dm_odm->RFCalibrateInfo.CCK_index =3D CCK_index_old; } =20 @@ -237,16 +234,13 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( } if (offset >=3D index_mapping_NUM_88E) offset =3D index_mapping_NUM_88E - 1; - for (i =3D 0; i < rf; i++) - OFDM_index[i] =3D dm_odm->RFCalibrateInfo.OFDM_index[i] + OFDM_index_m= apping[j][offset]; + OFDM_index[0] =3D dm_odm->RFCalibrateInfo.OFDM_index[0] + OFDM_index_ma= pping[j][offset]; CCK_index =3D dm_odm->RFCalibrateInfo.CCK_index + OFDM_index_mapping[j]= [offset]; =20 - for (i =3D 0; i < rf; i++) { - if (OFDM_index[i] > OFDM_TABLE_SIZE_92D - 1) - OFDM_index[i] =3D OFDM_TABLE_SIZE_92D - 1; - else if (OFDM_index[i] < OFDM_min_index) - OFDM_index[i] =3D OFDM_min_index; - } + if (OFDM_index[0] > OFDM_TABLE_SIZE_92D - 1) + OFDM_index[0] =3D OFDM_TABLE_SIZE_92D - 1; + else if (OFDM_index[0] < OFDM_min_index) + OFDM_index[0] =3D OFDM_min_index; =20 if (CCK_index > CCK_TABLE_SIZE - 1) CCK_index =3D CCK_TABLE_SIZE - 1; --=20 2.30.2 From nobody Mon Jun 29 17:36:50 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 B55FCC433EF for ; Sat, 5 Feb 2022 11:38:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376854AbiBELiJ (ORCPT ); Sat, 5 Feb 2022 06:38:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345136AbiBELh4 (ORCPT ); Sat, 5 Feb 2022 06:37:56 -0500 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 40F15C061353 for ; Sat, 5 Feb 2022 03:37:56 -0800 (PST) Received: from dslb-188-104-059-100.188.104.pools.vodafone-ip.de ([188.104.59.100] 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 1nGJO4-0005c9-L0; Sat, 05 Feb 2022 12:37:52 +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, Martin Kaiser Subject: [PATCH 6/8] staging: r8188eu: RfRegChnlVal[1] is set but not used Date: Sat, 5 Feb 2022 12:37:39 +0100 Message-Id: <20220205113741.379070-7-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220205113741.379070-1-martin@kaiser.cx> References: <20220205113741.379070-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" RfRegChnlVal[1] in hal_data_8188e is set but not used. This driver needs only one RfRegChnlVal setting. Replace the array with a single u32. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 4 ++-- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 8 ++++---- drivers/staging/r8188eu/hal/usb_halinit.c | 3 +-- drivers/staging/r8188eu/include/rtl8188e_hal.h | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_phycfg.c index 6e26359bdda7..cd82452238e0 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c @@ -724,8 +724,8 @@ static void _PHY_SwChnl8192C(struct adapter *Adapter, u= 8 channel) /* s2. RF dependent command - CmdID_RF_WriteReg, param1=3DRF_CHNLBW, para= m2=3Dchannel */ param1 =3D RF_CHNLBW; param2 =3D channel; - pHalData->RfRegChnlVal[0] =3D ((pHalData->RfRegChnlVal[0] & 0xfffffc00) |= param2); - rtl8188e_PHY_SetRFReg(Adapter, RF_PATH_A, param1, bRFRegOffsetMask, pHalD= ata->RfRegChnlVal[0]); + pHalData->RfRegChnlVal =3D ((pHalData->RfRegChnlVal & 0xfffffc00) | param= 2); + rtl8188e_PHY_SetRFReg(Adapter, RF_PATH_A, param1, bRFRegOffsetMask, pHalD= ata->RfRegChnlVal); } =20 void PHY_SwChnl8188E(struct adapter *Adapter, u8 channel) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rf6052.c index ea847ec39e13..2d5d04b384d1 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c @@ -50,12 +50,12 @@ void rtl8188e_PHY_RF6052SetBandwidth(struct adapter *Ad= apter, =20 switch (Bandwidth) { case HT_CHANNEL_WIDTH_20: - pHalData->RfRegChnlVal[0] =3D ((pHalData->RfRegChnlVal[0] & 0xfffff3ff) = | BIT(10) | BIT(11)); - rtl8188e_PHY_SetRFReg(Adapter, RF_PATH_A, RF_CHNLBW, bRFRegOffsetMask, p= HalData->RfRegChnlVal[0]); + pHalData->RfRegChnlVal =3D ((pHalData->RfRegChnlVal & 0xfffff3ff) | BIT(= 10) | BIT(11)); + rtl8188e_PHY_SetRFReg(Adapter, RF_PATH_A, RF_CHNLBW, bRFRegOffsetMask, p= HalData->RfRegChnlVal); break; case HT_CHANNEL_WIDTH_40: - pHalData->RfRegChnlVal[0] =3D ((pHalData->RfRegChnlVal[0] & 0xfffff3ff) = | BIT(10)); - rtl8188e_PHY_SetRFReg(Adapter, RF_PATH_A, RF_CHNLBW, bRFRegOffsetMask, p= HalData->RfRegChnlVal[0]); + pHalData->RfRegChnlVal =3D ((pHalData->RfRegChnlVal & 0xfffff3ff) | BIT(= 10)); + rtl8188e_PHY_SetRFReg(Adapter, RF_PATH_A, RF_CHNLBW, bRFRegOffsetMask, p= HalData->RfRegChnlVal); break; default: break; diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index f21b910bd88d..e8bc4a115a2b 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -668,8 +668,7 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) rtw_write16(Adapter, REG_PKT_BE_BK_LIFE_TIME, 0x0400); /* unit: 256us. 2= 56ms */ =20 /* Keep RfRegChnlVal for later use. */ - haldata->RfRegChnlVal[0] =3D rtl8188e_PHY_QueryRFReg(Adapter, (enum rf_ra= dio_path)0, RF_CHNLBW, bRFRegOffsetMask); - haldata->RfRegChnlVal[1] =3D rtl8188e_PHY_QueryRFReg(Adapter, (enum rf_ra= dio_path)1, RF_CHNLBW, bRFRegOffsetMask); + haldata->RfRegChnlVal =3D rtl8188e_PHY_QueryRFReg(Adapter, (enum rf_radio= _path)0, RF_CHNLBW, bRFRegOffsetMask); =20 _BBTurnOnBlock(Adapter); =20 diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index c323476f5936..c6472d13e069 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -143,7 +143,7 @@ struct hal_data_8188e { =20 struct bb_reg_def PHYRegDef[2]; /* Radio A/B */ =20 - u32 RfRegChnlVal[2]; + u32 RfRegChnlVal; =20 /* for host message to fw */ u8 LastHMEBoxNum; --=20 2.30.2 From nobody Mon Jun 29 17:36:50 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 0CDF5C433EF for ; Sat, 5 Feb 2022 11:38:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379718AbiBELiM (ORCPT ); Sat, 5 Feb 2022 06:38:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345725AbiBELh5 (ORCPT ); Sat, 5 Feb 2022 06:37:57 -0500 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 124E6C061346 for ; Sat, 5 Feb 2022 03:37:57 -0800 (PST) Received: from dslb-188-104-059-100.188.104.pools.vodafone-ip.de ([188.104.59.100] 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 1nGJO5-0005c9-Gp; Sat, 05 Feb 2022 12:37:53 +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, Martin Kaiser Subject: [PATCH 7/8] staging: r8188eu: use a define for the radio path Date: Sat, 5 Feb 2022 12:37:40 +0100 Message-Id: <20220205113741.379070-8-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220205113741.379070-1-martin@kaiser.cx> References: <20220205113741.379070-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" Replace (enum rf_radio_path)0 with RF_PATH_A. This should make it easier to see which path is selected. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/usb_halinit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index e8bc4a115a2b..0c0b7e819518 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -668,7 +668,7 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) rtw_write16(Adapter, REG_PKT_BE_BK_LIFE_TIME, 0x0400); /* unit: 256us. 2= 56ms */ =20 /* Keep RfRegChnlVal for later use. */ - haldata->RfRegChnlVal =3D rtl8188e_PHY_QueryRFReg(Adapter, (enum rf_radio= _path)0, RF_CHNLBW, bRFRegOffsetMask); + haldata->RfRegChnlVal =3D rtl8188e_PHY_QueryRFReg(Adapter, RF_PATH_A, RF_= CHNLBW, bRFRegOffsetMask); =20 _BBTurnOnBlock(Adapter); =20 --=20 2.30.2 From nobody Mon Jun 29 17:36:50 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 69E04C433F5 for ; Sat, 5 Feb 2022 11:38:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358243AbiBELiU (ORCPT ); Sat, 5 Feb 2022 06:38:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348103AbiBELh7 (ORCPT ); Sat, 5 Feb 2022 06:37:59 -0500 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 CFE97C061348 for ; Sat, 5 Feb 2022 03:37:58 -0800 (PST) Received: from dslb-188-104-059-100.188.104.pools.vodafone-ip.de ([188.104.59.100] 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 1nGJO6-0005c9-H4; Sat, 05 Feb 2022 12:37: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, Martin Kaiser Subject: [PATCH 8/8] staging: r8188eu: limit rf register writes to path a Date: Sat, 5 Feb 2022 12:37:41 +0100 Message-Id: <20220205113741.379070-9-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220205113741.379070-1-martin@kaiser.cx> References: <20220205113741.379070-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 r8188eu driver uses only RF_PATH_A. At the moment, the only exception are private ioctls. It does not make sense if these ioctls set registers that are not used anywhere else in the driver. This patch limits the private ioctl 0x0C, i.e. the rtw_wx_write_rf function, to RF_PATH_A. For any other setting, we return an error saying the parameter is invalid. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging= /r8188eu/os_dep/ioctl_linux.c index c54ec5602ddf..c41d75666568 100644 --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c @@ -2083,6 +2083,9 @@ static int rtw_wx_write_rf(struct net_device *dev, u32 path, addr, data32; =20 path =3D *(u32 *)extra; + if (path !=3D RF_PATH_A) + return -EINVAL; + addr =3D *((u32 *)extra + 1); data32 =3D *((u32 *)extra + 2); rtl8188e_PHY_SetRFReg(padapter, path, addr, 0xFFFFF, data32); --=20 2.30.2