[PATCH 05/28] staging: rtl8723au: ODM_BB_DIG is always set

[Jes.Sorensen at redhat.com]

From: Jes Sorensen <Jes.Sorensen at redhat.com>

Signed-off-by: Jes Sorensen <Jes.Sorensen at redhat.com>
---
 drivers/staging/rtl8723au/hal/odm.c         | 5 ++---
 drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 3 +--
 drivers/staging/rtl8723au/include/odm.h     | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8723au/hal/odm.c b/drivers/staging/rtl8723au/hal/odm.c
index 64dd980..406c503 100644
--- a/drivers/staging/rtl8723au/hal/odm.c
+++ b/drivers/staging/rtl8723au/hal/odm.c
@@ -583,10 +583,9 @@ void odm_DIG23a(struct rtw_adapter *adapter)
 	u8 CurrentIGI = pDM_DigTable->CurIGValue;
 
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG23a() ==>\n"));
-	/* if (!(pDM_Odm->SupportAbility & (ODM_BB_DIG|ODM_BB_FA_CNT))) */
-	if ((!(pDM_Odm->SupportAbility&ODM_BB_DIG)) || (!(pDM_Odm->SupportAbility&ODM_BB_FA_CNT))) {
+	if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT)) {
 		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD,
-			     ("odm_DIG23a() Return: SupportAbility ODM_BB_DIG or ODM_BB_FA_CNT is disabled\n"));
+			     ("odm_DIG23a() Return: SupportAbility ODM_BB_FA_CNT is disabled\n"));
 		return;
 	}
 
diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
index 61ff14a..16811ff 100644
--- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
@@ -129,8 +129,7 @@ static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter)
 	struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	int i;
-	pdmpriv->InitODMFlag =	ODM_BB_DIG		|
-				ODM_BB_DYNAMIC_TXPWR	|
+	pdmpriv->InitODMFlag =	ODM_BB_DYNAMIC_TXPWR	|
 				ODM_BB_FA_CNT		|
 				ODM_BB_RSSI_MONITOR	|
 				ODM_BB_CCK_PD		|
diff --git a/drivers/staging/rtl8723au/include/odm.h b/drivers/staging/rtl8723au/include/odm.h
index 4653518..7ee874a 100644
--- a/drivers/staging/rtl8723au/include/odm.h
+++ b/drivers/staging/rtl8723au/include/odm.h
@@ -347,7 +347,6 @@ enum odm_cmninfo {
 /*  Define ODM support ability.  ODM_CMNINFO_ABILITY */
 enum {
 	/*  BB ODM section BIT 0-15 */
-	ODM_BB_DIG				= BIT(0),
 	ODM_BB_DYNAMIC_TXPWR			= BIT(2),
 	ODM_BB_FA_CNT				= BIT(3),
 	ODM_BB_RSSI_MONITOR			= BIT(4),
-- 
2.1.0