From nobody Fri Dec 19 20:11:58 2025 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 12266C433FE for ; Sat, 8 Jan 2022 12:50:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234230AbiAHMuV (ORCPT ); Sat, 8 Jan 2022 07:50:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231678AbiAHMuS (ORCPT ); Sat, 8 Jan 2022 07:50:18 -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 26422C06173E for ; Sat, 8 Jan 2022 04:50:17 -0800 (PST) Received: from dslb-188-097-214-229.188.097.pools.vodafone-ip.de ([188.97.214.229] 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 1n6BAj-0005EJ-E8; Sat, 08 Jan 2022 13:50:13 +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 02/12] staging: r8188eu: ODM_BB_FA_CNT is always set Date: Sat, 8 Jan 2022 13:49:49 +0100 Message-Id: <20220108124959.313215-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220108124959.313215-1-martin@kaiser.cx> References: <20220108124959.313215-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_BB_FA_CNT flag is always set. Remove the flag and the code to check if ODM_BB_FA_CNT is not set. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/odm.c | 8 +------- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 3 +-- drivers/staging/r8188eu/include/odm.h | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/ha= l/odm.c index 77ece1950b63..7cc9ab4b1a59 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -169,9 +169,6 @@ static void odm_DIG(struct odm_dm_struct *pDM_Odm) u8 dm_dig_max, dm_dig_min; u8 CurrentIGI =3D pDM_DigTable->CurIGValue; =20 - if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT)) - return; - if (*pDM_Odm->pbScanInProcess) return; =20 @@ -367,9 +364,6 @@ static void odm_FalseAlarmCounterStatistics(struct odm_= dm_struct *pDM_Odm) struct false_alarm_stats *FalseAlmCnt =3D &pDM_Odm->FalseAlmCnt; struct adapter *adapter =3D pDM_Odm->Adapter; =20 - if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT)) - return; - /* hold ofdm counter */ rtl8188e_PHY_SetBBReg(adapter, ODM_REG_OFDM_FA_HOLDC_11N, BIT(31), 1); /*= hold page C counter */ rtl8188e_PHY_SetBBReg(adapter, ODM_REG_OFDM_FA_RSTD_11N, BIT(31), 1); /* = hold page D counter */ @@ -422,7 +416,7 @@ static void odm_CCKPacketDetectionThresh(struct odm_dm_= struct *pDM_Odm) u8 CurCCK_CCAThres; struct false_alarm_stats *FalseAlmCnt =3D &pDM_Odm->FalseAlmCnt; =20 - if (!(pDM_Odm->SupportAbility & (ODM_BB_CCK_PD | ODM_BB_FA_CNT))) + if (!(pDM_Odm->SupportAbility & ODM_BB_CCK_PD)) return; if (pDM_Odm->bLinked) { if (pDM_Odm->RSSI_Min > 25) { diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8= 188eu/hal/rtl8188e_dm.c index 5118d0e3045b..2ff9c7d84dbf 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c @@ -53,8 +53,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_FA_CNT | - ODM_BB_RSSI_MONITOR | + pdmpriv->InitODMFlag =3D ODM_BB_RSSI_MONITOR | ODM_BB_CCK_PD | ODM_RF_CALIBRATION | ODM_RF_TX_PWR_TRACK; diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 616a862180b2..664e75c3a7c2 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -148,7 +148,6 @@ enum odm_common_info_def { =20 enum odm_ability_def { /* BB ODM section BIT 0-15 */ - ODM_BB_FA_CNT =3D BIT(3), ODM_BB_RSSI_MONITOR =3D BIT(4), ODM_BB_CCK_PD =3D BIT(5), ODM_BB_ANT_DIV =3D BIT(6), --=20 2.30.2