From 353cb50dc7d42a062f0cd96c20543384fbf630eb Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Mon, 21 Jul 2014 11:24:49 +0200 Subject: [PATCH] staging: rtl8723au: Remove write-only variables struct dm_priv->{Init,}DMFlag Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723au/hal/hal_com.c | 6 ++---- drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 7 ------- drivers/staging/rtl8723au/include/rtl8723a_dm.h | 2 -- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8723au/hal/hal_com.c b/drivers/staging/rtl8723au/hal/hal_com.c index 8718151d127b..4a66ed52d22f 100644 --- 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 b7ed764423b8..479ce7ae7939 100644 --- 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 5ee3af4ca2db..18112225e53f 100644 --- 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*/ -- 2.11.0