staging: rtl8723au: Remove write-only struct dm_priv->DM_Type variable

[firefly-linux-kernel-4.4.55.git] / drivers / staging / rtl8723au / hal / rtl8723a_dm.c

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
index ac47a9711086b45bc11605cc0c5d426f6756ee5e..b7ed764423b8cbb4afe999ec1686a97c589da87d 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
@@ -34,10 +34,6 @@
 /*  Global var */
 /*  */
 
-static void dm_CheckStatistics(struct rtw_adapter *Adapter)
-{
-}
-
 static void dm_CheckPbcGPIO(struct rtw_adapter *padapter)
 {
        u8      tmp1byte;
@@ -189,7 +185,6 @@ void rtl8723a_InitHalDm(struct rtw_adapter *Adapter)
        struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
        u8      i;
 
-       pdmpriv->DM_Type = DM_Type_ByDriver;
        pdmpriv->DMFlag = DYNAMIC_FUNC_DISABLE;
 
 #ifdef CONFIG_8723AU_BT_COEXIST
@@ -211,6 +206,7 @@ rtl8723a_HalDmWatchDog(
 {
        bool            bFwCurrentInPSMode = false;
        bool            bFwPSAwake = true;
+       u8 bLinked = false;
        u8 hw_init_completed = false;
        struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
        struct dm_priv  *pdmpriv = &pHalData->dmpriv;
@@ -223,10 +219,7 @@ rtl8723a_HalDmWatchDog(
        bFwCurrentInPSMode = Adapter->pwrctrlpriv.bFwCurrentInPSMode;
        bFwPSAwake = rtl8723a_get_fwlps_rf_on(Adapter);
 
-       if ((hw_init_completed) && ((!bFwCurrentInPSMode) && bFwPSAwake)) {
-               /*  Calculate Tx/Rx statistics. */
-               dm_CheckStatistics(Adapter);
-
+       if (!bFwCurrentInPSMode && bFwPSAwake) {
                /*  Read REG_INIDATA_RATE_SEL value for TXDESC. */
                if (check_fwstate(&Adapter->mlmepriv, WIFI_STATION_STATE)) {
                        pdmpriv->INIDATA_RATE[0] = rtl8723au_read8(Adapter, REG_INIDATA_RATE_SEL) & 0x3f;
@@ -238,16 +231,11 @@ rtl8723a_HalDmWatchDog(
        }
 
        /* ODM */
-       if (hw_init_completed == true) {
-               u8      bLinked = false;
+       if (rtw_linked_check(Adapter))
+               bLinked = true;
 
-               if (rtw_linked_check(Adapter))
-                       bLinked = true;
-
-               ODM_CmnInfoUpdate23a(&pHalData->odmpriv, ODM_CMNINFO_LINK,
-                                    bLinked);
-               ODM_DMWatchdog23a(&pHalData->odmpriv);
-       }
+       ODM_CmnInfoUpdate23a(&pHalData->odmpriv, ODM_CMNINFO_LINK, bLinked);
+       ODM_DMWatchdog23a(&pHalData->odmpriv);
 
 skip_dm:
 
@@ -264,7 +252,3 @@ void rtl8723a_init_dm_priv(struct rtw_adapter *Adapter)
        memset(pdmpriv, 0, sizeof(struct dm_priv));
        Init_ODM_ComInfo_8723a(Adapter);
 }
-
-void rtl8723a_deinit_dm_priv(struct rtw_adapter *Adapter)
-{
-}