staging: rtl8723au: Remove write-only variables struct dm_priv->{Init,}DMFlag

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/hal_com.c b/drivers/staging/rtl8723au/hal/hal_com.c
index 8718151d127b390f08d38a615d332c74a27e9977..4a66ed52d22fa13884f850fece7f402ff2ea9b2d 100644 (file)
--- a/drivers/staging/rtl8723au/hal/hal_com.c
+++ b/drivers/staging/rtl8723au/hal/hal_com.c
@@ -867,12 +867,10 @@ void rtl8723a_odm_support_ability_set(struct rtw_adapter *padapter, u32 val)
 {
        struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter);
 
-       if (val == DYNAMIC_ALL_FUNC_ENABLE) {
-               pHalData->dmpriv.DMFlag = pHalData->dmpriv.InitDMFlag;
+       if (val == DYNAMIC_ALL_FUNC_ENABLE)
                pHalData->odmpriv.SupportAbility = pHalData->dmpriv.InitODMFlag;
-       } else {
+       else
                pHalData->odmpriv.SupportAbility |= val;
-       }
 }
 
 void rtl8723a_odm_support_ability_clr(struct rtw_adapter *padapter, u32 val)

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
index b7ed764423b8cbb4afe999ec1686a97c589da87d..479ce7ae7939f02600f1eab5f4debb4aba4765fd 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
@@ -185,13 +185,6 @@ void rtl8723a_InitHalDm(struct rtw_adapter *Adapter)
        struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
        u8      i;
 
-       pdmpriv->DMFlag = DYNAMIC_FUNC_DISABLE;
-
-#ifdef CONFIG_8723AU_BT_COEXIST
-       pdmpriv->DMFlag |= DYNAMIC_FUNC_BT;
-#endif
-       pdmpriv->InitDMFlag = pdmpriv->DMFlag;
-
        Update_ODM_ComInfo_8723a(Adapter);
        ODM23a_DMInit(pDM_Odm);
        /*  Save REG_INIDATA_RATE_SEL value for TXDESC. */

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_dm.h b/drivers/staging/rtl8723au/include/rtl8723a_dm.h
index 5ee3af4ca2db7f6f22e9e78b8b15426c4fa9c726..18112225e53f97f00632072226b55def072c22c8 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_dm.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_dm.h
@@ -39,8 +39,6 @@ enum{
 /*  duplicate code,will move to ODM ######### */
 struct dm_priv
 {
-       u8      DMFlag;
-       u8      InitDMFlag;
        u32     InitODMFlag;
 
        /*  Upper and Lower Signal threshold for Rate Adaptive*/