Commit dbc04d27 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman

staging: r8188eu: ODM_BB_FA_CNT is always set

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: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220108124959.313215-3-martin@kaiser.cxSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d0421343
...@@ -169,9 +169,6 @@ static void odm_DIG(struct odm_dm_struct *pDM_Odm) ...@@ -169,9 +169,6 @@ static void odm_DIG(struct odm_dm_struct *pDM_Odm)
u8 dm_dig_max, dm_dig_min; u8 dm_dig_max, dm_dig_min;
u8 CurrentIGI = pDM_DigTable->CurIGValue; u8 CurrentIGI = pDM_DigTable->CurIGValue;
if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT))
return;
if (*pDM_Odm->pbScanInProcess) if (*pDM_Odm->pbScanInProcess)
return; return;
...@@ -367,9 +364,6 @@ static void odm_FalseAlarmCounterStatistics(struct odm_dm_struct *pDM_Odm) ...@@ -367,9 +364,6 @@ static void odm_FalseAlarmCounterStatistics(struct odm_dm_struct *pDM_Odm)
struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt; struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt;
struct adapter *adapter = pDM_Odm->Adapter; struct adapter *adapter = pDM_Odm->Adapter;
if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT))
return;
/* hold ofdm counter */ /* 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_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 */ 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) ...@@ -422,7 +416,7 @@ static void odm_CCKPacketDetectionThresh(struct odm_dm_struct *pDM_Odm)
u8 CurCCK_CCAThres; u8 CurCCK_CCAThres;
struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt; 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; return;
if (pDM_Odm->bLinked) { if (pDM_Odm->bLinked) {
if (pDM_Odm->RSSI_Min > 25) { if (pDM_Odm->RSSI_Min > 25) {
......
...@@ -53,8 +53,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter) ...@@ -53,8 +53,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)
struct dm_priv *pdmpriv = &hal_data->dmpriv; struct dm_priv *pdmpriv = &hal_data->dmpriv;
int i; int i;
pdmpriv->InitODMFlag = ODM_BB_FA_CNT | pdmpriv->InitODMFlag = ODM_BB_RSSI_MONITOR |
ODM_BB_RSSI_MONITOR |
ODM_BB_CCK_PD | ODM_BB_CCK_PD |
ODM_RF_CALIBRATION | ODM_RF_CALIBRATION |
ODM_RF_TX_PWR_TRACK; ODM_RF_TX_PWR_TRACK;
......
...@@ -148,7 +148,6 @@ enum odm_common_info_def { ...@@ -148,7 +148,6 @@ enum odm_common_info_def {
enum odm_ability_def { enum odm_ability_def {
/* BB ODM section BIT 0-15 */ /* BB ODM section BIT 0-15 */
ODM_BB_FA_CNT = BIT(3),
ODM_BB_RSSI_MONITOR = BIT(4), ODM_BB_RSSI_MONITOR = BIT(4),
ODM_BB_CCK_PD = BIT(5), ODM_BB_CCK_PD = BIT(5),
ODM_BB_ANT_DIV = BIT(6), ODM_BB_ANT_DIV = BIT(6),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment