diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-07-21 09:25:00 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 19:09:27 (GMT) |
| commit | 638847c94b37fb173048129370029d3594e7de6d (patch) | |
| tree | 428385a5ac8f12b3ad4ebbbd06bde3c04f79aaf7 /drivers | |
| parent | 1a573d2bbeb379aa1fb3cd20be839a23a43d8a3e (diff) | |
| download | linux-638847c94b37fb173048129370029d3594e7de6d.tar.xz | |
staging: rtl8723au: Eliminate ODM_CMNINFO_POWER_SAVING usage
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rtl8723au/hal/odm.c | 8 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/include/odm.h | 3 |
3 files changed, 2 insertions, 13 deletions
diff --git a/drivers/staging/rtl8723au/hal/odm.c b/drivers/staging/rtl8723au/hal/odm.c index eadf2ed..754b816 100644 --- a/drivers/staging/rtl8723au/hal/odm.c +++ b/drivers/staging/rtl8723au/hal/odm.c @@ -291,6 +291,7 @@ void ODM_DMWatchdog23a(struct rtw_adapter *adapter) { struct hal_data_8723a *pHalData = GET_HAL_DATA(adapter); struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; + struct pwrctrl_priv *pwrctrlpriv = &adapter->pwrctrlpriv; /* 2012.05.03 Luke: For all IC series */ odm_CmnInfoHook_Debug23a(pDM_Odm); @@ -313,7 +314,7 @@ void ODM_DMWatchdog23a(struct rtw_adapter *adapter) odm_CCKPacketDetectionThresh23a(pDM_Odm); - if (*(pDM_Odm->pbPowerSaving)) + if (pwrctrlpriv->bpower_saving) return; odm_RefreshRateAdaptiveMask23a(pDM_Odm); @@ -418,9 +419,6 @@ void ODM23a_CmnInfoHook(struct dm_odm_t *pDM_Odm, /* Hook call by reference pointer. */ switch (CmnInfo) { /* Dynamic call by reference pointer. */ - case ODM_CMNINFO_POWER_SAVING: - pDM_Odm->pbPowerSaving = (bool *)pValue; - break; /* To remove the compiler warning, must add an empty default statement to handle the other values. */ default: /* do nothing */ @@ -541,8 +539,6 @@ void odm_CmnInfoInit_Debug23a(struct dm_odm_t *pDM_Odm) void odm_CmnInfoHook_Debug23a(struct dm_odm_t *pDM_Odm) { ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_CmnInfoHook_Debug23a ==>\n")); - - ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pbPowerSaving =%d\n", *(pDM_Odm->pbPowerSaving))); } void odm_CmnInfoUpdate_Debug23a(struct dm_odm_t *pDM_Odm) diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c index 22dec5c..fa3e5aa 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c @@ -133,7 +133,6 @@ static void Init_ODM_ComInfo_8723a(struct rtw_adapter *Adapter) static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter) { - struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv; struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter); struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv; @@ -151,9 +150,6 @@ static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter) /* Pointer reference */ rtl8723a_odm_support_ability_set(Adapter, DYNAMIC_ALL_FUNC_ENABLE); - ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_POWER_SAVING, - &pwrctrlpriv->bpower_saving); - for (i = 0; i < NUM_STA; i++) ODM_CmnInfoPtrArrayHook23a(pDM_Odm, ODM_CMNINFO_STA_STATUS, i, NULL); } diff --git a/drivers/staging/rtl8723au/include/odm.h b/drivers/staging/rtl8723au/include/odm.h index 300f8fb..58875f4 100644 --- a/drivers/staging/rtl8723au/include/odm.h +++ b/drivers/staging/rtl8723au/include/odm.h @@ -319,7 +319,6 @@ enum odm_cmninfo { /* */ /* Dynamic value: */ /* */ - ODM_CMNINFO_POWER_SAVING, ODM_CMNINFO_MP_MODE, ODM_CMNINFO_WIFI_DIRECT, @@ -683,8 +682,6 @@ struct dm_odm_t { bool bool_temp; struct rtw_adapter *PADAPTER_temp; - /* Common info for Status */ - bool *pbPowerSaving; /* POINTER REFERENCE----------- */ /* */ /* CALL BY VALUE------------- */ |