openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jes Sorensen 2014-07-21 11:25:00 +02:00 committed by Greg Kroah-Hartman
parent 1a573d2bbe
commit 638847c94b
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/rtl8723au/hal/odm.c
View File

@ -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)

4
drivers/staging/rtl8723au/hal/rtl8723a_dm.c
View File

@ -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);
}

3
drivers/staging/rtl8723au/include/odm.h
View File

@ -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------------- */