staging: rtl8723au: ODM_BB_RA_MASK is always set

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/odm.c b/drivers/staging/rtl8723au/hal/odm.c
index 8dcb020e1f181d8b08c6179839affef121a6bfc8..64dd980a170d262980f536d663d1ced9ef53e6f0 100644 (file)
--- 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);
@@ -1107,25 +1105,14 @@ 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 85be3e0d7feb8a16f38b6ec83f735d428b17cc42..61ff14aca36503a9875c1a328784fe09b0474e8a 100644 (file)
--- 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 50459f09dbbb3814641fd44f5a98aba17cc7541d..4653518f3d7e48f9bb9dd744ca0e1bcf64207fb5 100644 (file)
--- 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),