From nobody Wed Jul 1 13:45:27 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 99998C433F5 for ; Sat, 22 Jan 2022 17:06:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234571AbiAVRGE (ORCPT ); Sat, 22 Jan 2022 12:06:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229773AbiAVRGC (ORCPT ); Sat, 22 Jan 2022 12:06:02 -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 4CE40C06173B for ; Sat, 22 Jan 2022 09:06:02 -0800 (PST) Received: from dslb-188-097-041-028.188.097.pools.vodafone-ip.de ([188.97.41.28] 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 1nBJps-0002IN-Ne; Sat, 22 Jan 2022 18:05: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, Martin Kaiser Subject: [PATCH 1/4] staging: r8188eu: EntryMaxUndecoratedSmoothedPWDB is set but not used Date: Sat, 22 Jan 2022 18:05:44 +0100 Message-Id: <20220122170547.68378-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220122170547.68378-1-martin@kaiser.cx> References: <20220122170547.68378-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 variable EntryMaxUndecoratedSmoothedPWDB in struct dm_priv is set but not used. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm.c | 5 ----- drivers/staging/r8188eu/include/rtl8188e_dm.h | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/ha= l/odm.c index 8156e4acaa09..7de0f458d788 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -494,11 +494,6 @@ static void odm_RSSIMonitorCheck(struct odm_dm_struct = *pDM_Odm) } } =20 - if (tmpEntryMaxPWDB !=3D 0) /* If associated entry is found */ - pdmpriv->EntryMaxUndecoratedSmoothedPWDB =3D tmpEntryMaxPWDB; - else - pdmpriv->EntryMaxUndecoratedSmoothedPWDB =3D 0; - if (tmpEntryMinPWDB !=3D 0xff) /* If associated entry is found */ pdmpriv->EntryMinUndecoratedSmoothedPWDB =3D tmpEntryMinPWDB; else diff --git a/drivers/staging/r8188eu/include/rtl8188e_dm.h b/drivers/stagin= g/r8188eu/include/rtl8188e_dm.h index 0b3a9a1a4e5c..d62cdfc2db20 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_dm.h +++ b/drivers/staging/r8188eu/include/rtl8188e_dm.h @@ -12,9 +12,8 @@ enum{ struct dm_priv { u32 InitODMFlag; =20 - /* Upper and Lower Signal threshold for Rate Adaptive*/ + /* Lower Signal threshold for Rate Adaptive */ int EntryMinUndecoratedSmoothedPWDB; - int EntryMaxUndecoratedSmoothedPWDB; int MinUndecoratedPWDBForDM; }; =20 --=20 2.30.2 From nobody Wed Jul 1 13:45:27 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 54399C433EF for ; Sat, 22 Jan 2022 17:06:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234601AbiAVRGQ (ORCPT ); Sat, 22 Jan 2022 12:06:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234574AbiAVRGG (ORCPT ); Sat, 22 Jan 2022 12:06:06 -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 33B8FC06173B for ; Sat, 22 Jan 2022 09:06:06 -0800 (PST) Received: from dslb-188-097-041-028.188.097.pools.vodafone-ip.de ([188.97.41.28] 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 1nBJpt-0002IN-Gc; Sat, 22 Jan 2022 18:05: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, Martin Kaiser Subject: [PATCH 2/4] staging: r8188eu: ODM_RF_TX_PWR_TRACK is always set Date: Sat, 22 Jan 2022 18:05:45 +0100 Message-Id: <20220122170547.68378-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220122170547.68378-1-martin@kaiser.cx> References: <20220122170547.68378-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 ODM_RF_TX_PWR_TRACK flag is set in Init_ODM_ComInfo_88E directly after the driver is probed and it's never cleared. Remove the flag and the one place where it's checked. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm.c | 3 --- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 7 ++----- drivers/staging/r8188eu/include/odm.h | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/ha= l/odm.c index 7de0f458d788..9b4b75c225a7 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -898,9 +898,6 @@ void ODM_TXPowerTrackingCheck(struct odm_dm_struct *pDM= _Odm) { struct adapter *Adapter =3D pDM_Odm->Adapter; =20 - if (!(pDM_Odm->SupportAbility & ODM_RF_TX_PWR_TRACK)) - return; - if (!pDM_Odm->RFCalibrateInfo.TM_Trigger) { /* at least delay 1 sec */ rtl8188e_PHY_SetRFReg(Adapter, RF_PATH_A, RF_T_METER_88E, BIT(17) | BIT(= 16), 0x03); =20 diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8= 188eu/hal/rtl8188e_dm.c index adf87c1721ee..2f7294f0486d 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c @@ -37,8 +37,7 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter) =20 ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_RF_ANTENNA_TYPE, hal_data->TRxAntDivT= ype); =20 - pdmpriv->InitODMFlag =3D ODM_RF_CALIBRATION | - ODM_RF_TX_PWR_TRACK; + pdmpriv->InitODMFlag =3D ODM_RF_CALIBRATION; =20 ODM_CmnInfoUpdate(dm_odm, ODM_CMNINFO_ABILITY, pdmpriv->InitODMFlag); } @@ -53,9 +52,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapte= r) struct dm_priv *pdmpriv =3D &hal_data->dmpriv; int i; =20 - pdmpriv->InitODMFlag =3D ODM_BB_RSSI_MONITOR | - ODM_RF_CALIBRATION | - ODM_RF_TX_PWR_TRACK; + pdmpriv->InitODMFlag =3D ODM_BB_RSSI_MONITOR | ODM_RF_CALIBRATION; if (hal_data->AntDivCfg) pdmpriv->InitODMFlag |=3D ODM_BB_ANT_DIV; =20 diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 50960e7daf1d..ed6f724841d3 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -153,7 +153,6 @@ enum odm_ability_def { ODM_BB_PWR_TRA =3D BIT(8), =20 /* RF ODM section BIT 24-31 */ - ODM_RF_TX_PWR_TRACK =3D BIT(24), ODM_RF_CALIBRATION =3D BIT(26), }; =20 --=20 2.30.2 From nobody Wed Jul 1 13:45:27 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 F31EFC433FE for ; Sat, 22 Jan 2022 17:06:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234598AbiAVRGM (ORCPT ); Sat, 22 Jan 2022 12:06:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231770AbiAVRGD (ORCPT ); Sat, 22 Jan 2022 12:06:03 -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 A334FC061401 for ; Sat, 22 Jan 2022 09:06:02 -0800 (PST) Received: from dslb-188-097-041-028.188.097.pools.vodafone-ip.de ([188.97.41.28] 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 1nBJpu-0002IN-90; Sat, 22 Jan 2022 18:05: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, Martin Kaiser Subject: [PATCH 3/4] staging: r8188eu: ODM_RF_CALIBRATION is always set Date: Sat, 22 Jan 2022 18:05:46 +0100 Message-Id: <20220122170547.68378-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220122170547.68378-1-martin@kaiser.cx> References: <20220122170547.68378-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 ODM_RF_CALIBRATION flag is set in Init_ODM_ComInfo_88E directly after the driver is probed and it's never cleared. Remove the flag and the code where it's set or checked. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 5 ----- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 7 +------ drivers/staging/r8188eu/include/odm.h | 3 --- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging= /r8188eu/hal/HalPhyRf_8188e.c index 21ecc90a558c..5f7a2668cabb 100644 --- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c @@ -893,9 +893,6 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool = recovery) rOFDM0_XCTxAFE, rOFDM0_XDTxAFE, rOFDM0_RxIQExtAnta}; =20 - if (!(dm_odm->SupportAbility & ODM_RF_CALIBRATION)) - return; - /* 20120213 Turn on when continuous Tx to pass lab testing. (req= uired by Edlu) */ if (singletone || carrier_sup) return; @@ -993,8 +990,6 @@ void PHY_LCCalibrate_8188E(struct adapter *adapt) struct hal_data_8188e *pHalData =3D &adapt->haldata; struct odm_dm_struct *dm_odm =3D &pHalData->odmpriv; =20 - if (!(dm_odm->SupportAbility & ODM_RF_CALIBRATION)) - return; /* 20120213 Turn on when continuous Tx to pass lab testing. (req= uired by Edlu) */ if (singletone || carrier_sup) return; diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8= 188eu/hal/rtl8188e_dm.c index 2f7294f0486d..558aa85f1a9f 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c @@ -25,7 +25,6 @@ static void dm_InitGPIOSetting(struct adapter *Adapter) static void Init_ODM_ComInfo_88E(struct adapter *Adapter) { struct hal_data_8188e *hal_data =3D &Adapter->haldata; - struct dm_priv *pdmpriv =3D &hal_data->dmpriv; struct odm_dm_struct *dm_odm =3D &hal_data->odmpriv; =20 /* Init Value */ @@ -36,10 +35,6 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter) ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_MP_TEST_CHIP, IS_NORMAL_CHIP(hal_data= ->VersionID)); =20 ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_RF_ANTENNA_TYPE, hal_data->TRxAntDivT= ype); - - pdmpriv->InitODMFlag =3D ODM_RF_CALIBRATION; - - ODM_CmnInfoUpdate(dm_odm, ODM_CMNINFO_ABILITY, pdmpriv->InitODMFlag); } =20 static void Update_ODM_ComInfo_88E(struct adapter *Adapter) @@ -52,7 +47,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapte= r) struct dm_priv *pdmpriv =3D &hal_data->dmpriv; int i; =20 - pdmpriv->InitODMFlag =3D ODM_BB_RSSI_MONITOR | ODM_RF_CALIBRATION; + pdmpriv->InitODMFlag =3D ODM_BB_RSSI_MONITOR; if (hal_data->AntDivCfg) pdmpriv->InitODMFlag |=3D ODM_BB_ANT_DIV; =20 diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index ed6f724841d3..63e0b6725bee 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -151,9 +151,6 @@ enum odm_ability_def { ODM_BB_RSSI_MONITOR =3D BIT(4), ODM_BB_ANT_DIV =3D BIT(6), ODM_BB_PWR_TRA =3D BIT(8), - - /* RF ODM section BIT 24-31 */ - ODM_RF_CALIBRATION =3D BIT(26), }; =20 # define ODM_ITRF_USB 0x2 --=20 2.30.2 From nobody Wed Jul 1 13:45:27 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 D3642C4332F for ; Sat, 22 Jan 2022 17:06:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234588AbiAVRGK (ORCPT ); Sat, 22 Jan 2022 12:06:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234552AbiAVRGD (ORCPT ); Sat, 22 Jan 2022 12:06:03 -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 C1A77C061744 for ; Sat, 22 Jan 2022 09:06:02 -0800 (PST) Received: from dslb-188-097-041-028.188.097.pools.vodafone-ip.de ([188.97.41.28] 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 1nBJpv-0002IN-34; Sat, 22 Jan 2022 18:05: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, Martin Kaiser Subject: [PATCH 4/4] staging: r8188eu: merge Init_ODM_ComInfo_88E and rtl8188e_init_dm_priv Date: Sat, 22 Jan 2022 18:05:47 +0100 Message-Id: <20220122170547.68378-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220122170547.68378-1-martin@kaiser.cx> References: <20220122170547.68378-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" rtl8188e_init_dm_priv is the only caller of Init_ODM_ComInfo_88E. Merge the two functions. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8= 188eu/hal/rtl8188e_dm.c index 558aa85f1a9f..a05d8687c18d 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c @@ -22,21 +22,6 @@ static void dm_InitGPIOSetting(struct adapter *Adapter) /* */ /* functions */ /* */ -static void Init_ODM_ComInfo_88E(struct adapter *Adapter) -{ - struct hal_data_8188e *hal_data =3D &Adapter->haldata; - struct odm_dm_struct *dm_odm =3D &hal_data->odmpriv; - - /* Init Value */ - memset(dm_odm, 0, sizeof(*dm_odm)); - - dm_odm->Adapter =3D Adapter; - - ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_MP_TEST_CHIP, IS_NORMAL_CHIP(hal_data= ->VersionID)); - - ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_RF_ANTENNA_TYPE, hal_data->TRxAntDivT= ype); -} - static void Update_ODM_ComInfo_88E(struct adapter *Adapter) { struct mlme_ext_priv *pmlmeext =3D &Adapter->mlmeextpriv; @@ -102,9 +87,14 @@ void rtl8188e_init_dm_priv(struct adapter *Adapter) { struct hal_data_8188e *hal_data =3D &Adapter->haldata; struct dm_priv *pdmpriv =3D &hal_data->dmpriv; + struct odm_dm_struct *dm_odm =3D &hal_data->odmpriv; =20 memset(pdmpriv, 0, sizeof(struct dm_priv)); - Init_ODM_ComInfo_88E(Adapter); + memset(dm_odm, 0, sizeof(*dm_odm)); + + dm_odm->Adapter =3D Adapter; + ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_MP_TEST_CHIP, IS_NORMAL_CHIP(hal_data= ->VersionID)); + ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_RF_ANTENNA_TYPE, hal_data->TRxAntDivT= ype); } =20 /* Add new function to reset the state of antenna diversity before link. = */ --=20 2.30.2