From: Martin Kaiser <martin@kaiser.cx>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
Phillip Potter <phil@philpotter.co.uk>,
Michael Straube <straube.linux@gmail.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH 02/12] staging: r8188eu: ODM_BB_FA_CNT is always set
Date: Sat, 8 Jan 2022 13:49:49 +0100 [thread overview]
Message-ID: <20220108124959.313215-3-martin@kaiser.cx> (raw)
In-Reply-To: <20220108124959.313215-1-martin@kaiser.cx>
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 <martin@kaiser.cx>
---
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/hal/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 = pDM_DigTable->CurIGValue;
- if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT))
- return;
-
if (*pDM_Odm->pbScanInProcess)
return;
@@ -367,9 +364,6 @@ static void odm_FalseAlarmCounterStatistics(struct odm_dm_struct *pDM_Odm)
struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt;
struct adapter *adapter = pDM_Odm->Adapter;
- 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 = &pDM_Odm->FalseAlmCnt;
- 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/r8188eu/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 *Adapter)
struct dm_priv *pdmpriv = &hal_data->dmpriv;
int i;
- pdmpriv->InitODMFlag = ODM_BB_FA_CNT |
- ODM_BB_RSSI_MONITOR |
+ pdmpriv->InitODMFlag = 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/r8188eu/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 {
enum odm_ability_def {
/* BB ODM section BIT 0-15 */
- ODM_BB_FA_CNT = BIT(3),
ODM_BB_RSSI_MONITOR = BIT(4),
ODM_BB_CCK_PD = BIT(5),
ODM_BB_ANT_DIV = BIT(6),
--
2.30.2
next prev parent reply other threads:[~2022-01-08 12:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-08 12:49 [PATCH 00/12] staging: r8188eu: another round of cleanups Martin Kaiser
2022-01-08 12:49 ` [PATCH 01/12] staging: r8188eu: ODM_MAC_EDCA_TURBO is always set Martin Kaiser
2022-01-08 12:49 ` Martin Kaiser [this message]
2022-01-08 12:49 ` [PATCH 03/12] staging: r8188eu: ODM_BB_CCK_PD " Martin Kaiser
2022-01-08 12:49 ` [PATCH 04/12] staging: r8188eu: remove unused chip type settings Martin Kaiser
2022-01-08 12:49 ` [PATCH 05/12] staging: r8188eu: remove obsolete defines and comments Martin Kaiser
2022-01-08 12:49 ` [PATCH 06/12] staging: r8188eu: CurrentBW4024GTxPwrIdx is set but not used Martin Kaiser
2022-01-08 12:49 ` [PATCH 07/12] staging: r8188eu: CurrentBW2024GTxPwrIdx " Martin Kaiser
2022-01-08 12:49 ` [PATCH 08/12] staging: r8188eu: CurrentOfdm24GTxPwrIdx " Martin Kaiser
2022-01-08 12:49 ` [PATCH 09/12] staging: r8188eu: CurrentCckTxPwrIdx " Martin Kaiser
2022-01-08 12:49 ` [PATCH 10/12] staging: r8188eu: HW_VAR_MEDIA_STATUS1 is never set Martin Kaiser
2022-01-08 12:49 ` [PATCH 11/12] staging: r8188eu: remove HAL_*_ENABLE defines Martin Kaiser
2022-01-08 12:49 ` [PATCH 12/12] staging: r8188eu: we always enqueue in rtw_set_chplan_cmd Martin Kaiser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220108124959.313215-3-martin@kaiser.cx \
--to=martin@kaiser.cx \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
--cc=straube.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®