[PATCH 04/28] staging: rtl8723au: ODM_BB_RA_MASK is always set

Jes.Sorensen at redhat.com Jes.Sorensen at redhat.com
Mon Mar 2 20:24:39 UTC 2015


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

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

diff --git a/drivers/staging/rtl8723au/hal/odm.c b/drivers/staging/rtl8723au/hal/odm.c
index 8dcb020..64dd980 100644
--- a/drivers/staging/rtl8723au/hal/odm.c
+++ b/drivers/staging/rtl8723au/hal/odm.c
@@ -189,8 +189,6 @@ void odm_DynamicBBPowerSaving23a(struct dm_odm_t *pDM_Odm);
 
 /* END---------BB POWER SAVE----------------------- */
 
-void odm_RefreshRateAdaptiveMask23aCE23a(struct dm_odm_t *pDM_Odm);
-
 void odm_DynamicTxPower23aInit(struct dm_odm_t *pDM_Odm);
 
 void odm_RSSIMonitorCheck23aCE(struct dm_odm_t *pDM_Odm);
@@ -1108,24 +1106,13 @@ u32 ODM_Get_Rate_Bitmap23a(struct hal_data_8723a *pHalData, u32 macid,
  *---------------------------------------------------------------------------*/
 void odm_RefreshRateAdaptiveMask23a(struct dm_odm_t *pDM_Odm)
 {
-	if (!(pDM_Odm->SupportAbility & ODM_BB_RA_MASK))
-		return;
-	/*  */
-	/*  2011/09/29 MH In HW integration first stage, we provide 4 different handle to operate */
-	/*  at the same time. In the stage2/3, we need to prive universal interface and merge all */
-	/*  HW dynamic mechanism. */
-	/*  */
-	odm_RefreshRateAdaptiveMask23aCE23a(pDM_Odm);
-}
-
-void odm_RefreshRateAdaptiveMask23aCE23a(struct dm_odm_t *pDM_Odm)
-{
 	u8 i;
 	struct rtw_adapter *pAdapter	 =  pDM_Odm->Adapter;
 
 	if (pAdapter->bDriverStopped) {
 		ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_TRACE,
-			     ("<---- odm_RefreshRateAdaptiveMask23a(): driver is going to unload\n"));
+			     ("<---- %s: driver is going to unload\n",
+			      __func__));
 		return;
 	}
 
diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
index 85be3e0..61ff14a 100644
--- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
@@ -130,7 +130,6 @@ static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter)
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	int i;
 	pdmpriv->InitODMFlag =	ODM_BB_DIG		|
-				ODM_BB_RA_MASK		|
 				ODM_BB_DYNAMIC_TXPWR	|
 				ODM_BB_FA_CNT		|
 				ODM_BB_RSSI_MONITOR	|
diff --git a/drivers/staging/rtl8723au/include/odm.h b/drivers/staging/rtl8723au/include/odm.h
index 50459f0..4653518 100644
--- a/drivers/staging/rtl8723au/include/odm.h
+++ b/drivers/staging/rtl8723au/include/odm.h
@@ -348,7 +348,6 @@ enum odm_cmninfo {
 enum {
 	/*  BB ODM section BIT 0-15 */
 	ODM_BB_DIG				= BIT(0),
-	ODM_BB_RA_MASK				= BIT(1),
 	ODM_BB_DYNAMIC_TXPWR			= BIT(2),
 	ODM_BB_FA_CNT				= BIT(3),
 	ODM_BB_RSSI_MONITOR			= BIT(4),
-- 
2.1.0



More information about the devel mailing list