skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-25 14:03:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Fix checkpatch errors in core/rtw_pwrctrl.c

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-31 01:27:28 -05:00
parent cee2832224
commit b03da9e17a
1 changed files with 135 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

189
core/rtw_pwrctrl.c
View file

@ -57,8 +57,7 @@ void ips_enter(struct adapter * padapter)
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BTDM_TurnOffBtCoexistBeforeEnterIPS(padapter); BTDM_TurnOffBtCoexistBeforeEnterIPS(padapter);
#endif #endif
if (rf_off == pwrpriv->change_rfpwrstate ) if (rf_off == pwrpriv->change_rfpwrstate) {
{
pwrpriv->bpower_saving = true; pwrpriv->bpower_saving = true;
DBG_88E_LEVEL(_drv_info_, "nolinked power save enter\n"); DBG_88E_LEVEL(_drv_info_, "nolinked power save enter\n");
@ -71,7 +70,6 @@ void ips_enter(struct adapter * padapter)
pwrpriv->bips_processing = false; pwrpriv->bips_processing = false;
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
} }
int ips_leave(struct adapter *padapter) int ips_leave(struct adapter *padapter)
@ -85,20 +83,19 @@ int ips_leave(struct adapter * padapter)
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
if ((pwrpriv->rf_pwrstate == rf_off) &&(!pwrpriv->bips_processing)) if ((pwrpriv->rf_pwrstate == rf_off) && (!pwrpriv->bips_processing)) {
{
pwrpriv->bips_processing = true; pwrpriv->bips_processing = true;
pwrpriv->change_rfpwrstate = rf_on; pwrpriv->change_rfpwrstate = rf_on;
pwrpriv->ips_leave_cnts++; pwrpriv->ips_leave_cnts++;
DBG_88E("==>ips_leave cnts:%d\n", pwrpriv->ips_leave_cnts); DBG_88E("==>ips_leave cnts:%d\n", pwrpriv->ips_leave_cnts);
if ((result = rtw_ips_pwr_up(padapter)) == _SUCCESS) { result = rtw_ips_pwr_up(padapter);
if (result == _SUCCESS) {
pwrpriv->rf_pwrstate = rf_on; pwrpriv->rf_pwrstate = rf_on;
} }
DBG_88E_LEVEL(_drv_info_, "nolinked power save leave\n"); DBG_88E_LEVEL(_drv_info_, "nolinked power save leave\n");
if ((_WEP40_ == psecuritypriv->dot11PrivacyAlgrthm) ||(_WEP104_ == psecuritypriv->dot11PrivacyAlgrthm)) if ((_WEP40_ == psecuritypriv->dot11PrivacyAlgrthm) || (_WEP104_ == psecuritypriv->dot11PrivacyAlgrthm)) {
{
DBG_88E("==>%s, channel(%d), processing(%x)\n", __func__, padapter->mlmeextpriv.cur_channel, pwrpriv->bips_processing); DBG_88E("==>%s, channel(%d), processing(%x)\n", __func__, padapter->mlmeextpriv.cur_channel, pwrpriv->bips_processing);
set_channel_bwmode(padapter, padapter->mlmeextpriv.cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); set_channel_bwmode(padapter, padapter->mlmeextpriv.cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
for (keyid = 0; keyid < 4; keyid++) { for (keyid = 0; keyid < 4; keyid++) {
@ -133,21 +130,19 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter)
bool ret = false; bool ret = false;
if (adapter->pwrctrlpriv.ips_deny_time >= rtw_get_current_time()) { if (adapter->pwrctrlpriv.ips_deny_time >= rtw_get_current_time())
/* DBG_88E("%s ips_deny_time\n", __func__); */
goto exit; goto exit;
}
if (check_fwstate(pmlmepriv, WIFI_ASOC_STATE|WIFI_SITE_MONITOR) if (check_fwstate(pmlmepriv, WIFI_ASOC_STATE|WIFI_SITE_MONITOR) ||
|| check_fwstate(pmlmepriv, WIFI_UNDER_LINKING|WIFI_UNDER_WPS) check_fwstate(pmlmepriv, WIFI_UNDER_LINKING|WIFI_UNDER_WPS) ||
|| check_fwstate(pmlmepriv, WIFI_AP_STATE) check_fwstate(pmlmepriv, WIFI_AP_STATE) ||
|| check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_ADHOC_STATE) check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_ADHOC_STATE) ||
#if defined(CONFIG_P2P) #if defined(CONFIG_P2P)
|| !rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) !rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
#else
0)
#endif #endif
) {
goto exit; goto exit;
}
/* consider buddy, if exist */ /* consider buddy, if exist */
if (buddy) { if (buddy) {
@ -156,17 +151,17 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter)
struct wifidirect_info *b_pwdinfo = &(buddy->wdinfo); struct wifidirect_info *b_pwdinfo = &(buddy->wdinfo);
#endif #endif
if (check_fwstate(b_pmlmepriv, WIFI_ASOC_STATE|WIFI_SITE_MONITOR) if (check_fwstate(b_pmlmepriv, WIFI_ASOC_STATE|WIFI_SITE_MONITOR) ||
|| check_fwstate(b_pmlmepriv, WIFI_UNDER_LINKING|WIFI_UNDER_WPS) check_fwstate(b_pmlmepriv, WIFI_UNDER_LINKING|WIFI_UNDER_WPS) ||
|| check_fwstate(b_pmlmepriv, WIFI_AP_STATE) check_fwstate(b_pmlmepriv, WIFI_AP_STATE) ||
|| check_fwstate(b_pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_ADHOC_STATE) check_fwstate(b_pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_ADHOC_STATE) ||
#if defined(CONFIG_P2P) #if defined(CONFIG_P2P)
|| !rtw_p2p_chk_state(b_pwdinfo, P2P_STATE_NONE) !rtw_p2p_chk_state(b_pwdinfo, P2P_STATE_NONE))
#else
0)
#endif #endif
) {
goto exit; goto exit;
} }
}
ret = true; ret = true;
exit: exit:
@ -184,26 +179,20 @@ void rtw_ps_processor(struct adapter*padapter)
pwrpriv->ps_processing = true; pwrpriv->ps_processing = true;
if (pwrpriv->bips_processing == true) if (pwrpriv->bips_processing)
goto exit; goto exit;
/* DBG_88E("==> fw report state(0x%x)\n",rtw_read8(padapter,0x1ca)); */ if (padapter->pwrctrlpriv.bHWPwrPindetect) {
if (padapter->pwrctrlpriv.bHWPwrPindetect)
{
rfpwrstate = RfOnOffDetect(padapter); rfpwrstate = RfOnOffDetect(padapter);
DBG_88E("@@@@- #2 %s==> rfstate:%s\n", __func__, (rfpwrstate == rf_on) ? "rf_on" : "rf_off"); DBG_88E("@@@@- #2 %s==> rfstate:%s\n", __func__, (rfpwrstate == rf_on) ? "rf_on" : "rf_off");
if (rfpwrstate!= pwrpriv->rf_pwrstate) if (rfpwrstate != pwrpriv->rf_pwrstate) {
{ if (rfpwrstate == rf_off) {
if (rfpwrstate == rf_off)
{
pwrpriv->change_rfpwrstate = rf_off; pwrpriv->change_rfpwrstate = rf_off;
pwrpriv->brfoffbyhw = true; pwrpriv->brfoffbyhw = true;
padapter->bCardDisableWOHSM = true; padapter->bCardDisableWOHSM = true;
rtw_hw_suspend(padapter); rtw_hw_suspend(padapter);
} } else {
else
{
pwrpriv->change_rfpwrstate = rf_on; pwrpriv->change_rfpwrstate = rf_on;
rtw_hw_resume(padapter); rtw_hw_resume(padapter);
} }
@ -218,8 +207,7 @@ void rtw_ps_processor(struct adapter*padapter)
if (rtw_pwr_unassociated_idle(padapter) == false) if (rtw_pwr_unassociated_idle(padapter) == false)
goto exit; goto exit;
if ((pwrpriv->rf_pwrstate == rf_on) && ((pwrpriv->pwr_state_check_cnts%4)==0)) if ((pwrpriv->rf_pwrstate == rf_on) && ((pwrpriv->pwr_state_check_cnts%4) == 0)) {
{
DBG_88E("==>%s .fw_state(%x)\n", __func__, get_fwstate(pmlmepriv)); DBG_88E("==>%s .fw_state(%x)\n", __func__, get_fwstate(pmlmepriv));
pwrpriv->change_rfpwrstate = rf_off; pwrpriv->change_rfpwrstate = rf_off;
@ -254,8 +242,7 @@ _func_enter_;
pslv = PS_STATE(pslv); pslv = PS_STATE(pslv);
if (true == pwrpriv->btcoex_rfon) if (pwrpriv->btcoex_rfon) {
{
if (pslv < PS_STATE_S4) if (pslv < PS_STATE_S4)
pslv = PS_STATE_S3; pslv = PS_STATE_S3;
} }
@ -266,9 +253,8 @@ _func_enter_;
return; return;
} }
if ((padapter->bSurpriseRemoved == true) || if ((padapter->bSurpriseRemoved) ||
(padapter->hw_init_completed == false)) (!padapter->hw_init_completed)) {
{
RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,
("%s: SurpriseRemoved(%d) hw_init_completed(%d)\n", ("%s: SurpriseRemoved(%d) hw_init_completed(%d)\n",
__func__, padapter->bSurpriseRemoved, padapter->hw_init_completed)); __func__, padapter->bSurpriseRemoved, padapter->hw_init_completed));
@ -278,8 +264,7 @@ _func_enter_;
return; return;
} }
if (padapter->bDriverStopped == true) if (padapter->bDriverStopped) {
{
RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,
("%s: change power state(0x%02X) when DriverStopped\n", __func__, pslv)); ("%s: change power state(0x%02X) when DriverStopped\n", __func__, pslv));
@ -304,7 +289,6 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
u8 PS_RDY_CHECK(struct adapter * padapter);
u8 PS_RDY_CHECK(struct adapter *padapter) u8 PS_RDY_CHECK(struct adapter *padapter)
{ {
u32 curr_time, delta_time; u32 curr_time, delta_time;
@ -316,27 +300,24 @@ u8 PS_RDY_CHECK(struct adapter * padapter)
delta_time = curr_time - pwrpriv->DelayLPSLastTimeStamp; delta_time = curr_time - pwrpriv->DelayLPSLastTimeStamp;
if (delta_time < LPS_DELAY_TIME) if (delta_time < LPS_DELAY_TIME)
{
return false; return false;
}
if ((check_fwstate(pmlmepriv, _FW_LINKED) == false) || if ((check_fwstate(pmlmepriv, _FW_LINKED) == false) ||
(check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) || (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) ||
(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) || (check_fwstate(pmlmepriv, WIFI_AP_STATE)) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) || (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) ) (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)))
return false; return false;
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
if (true == pwrpriv->bInSuspend && pwrpriv->wowlan_mode) if (pwrpriv->bInSuspend && pwrpriv->wowlan_mode)
return true; return true;
else else
return false; return false;
#else #else
if (true == pwrpriv->bInSuspend ) if (pwrpriv->bInSuspend)
return false; return false;
#endif #endif
if ( (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) && (padapter->securitypriv.binstallGrpkey == false) ) if ((padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) && (padapter->securitypriv.binstallGrpkey == false)) {
{
DBG_88E("Group handshake still in progress !!!\n"); DBG_88E("Group handshake still in progress !!!\n");
return false; return false;
} }
@ -361,16 +342,14 @@ _func_enter_;
return; return;
} }
if (pwrpriv->pwr_mode == ps_mode) if (pwrpriv->pwr_mode == ps_mode) {
{ if (PS_MODE_ACTIVE == ps_mode)
if (PS_MODE_ACTIVE == ps_mode) return; return;
if ((pwrpriv->smart_ps == smart_ps) && if ((pwrpriv->smart_ps == smart_ps) &&
(pwrpriv->bcn_ant_mode == bcn_ant_mode)) (pwrpriv->bcn_ant_mode == bcn_ant_mode))
{
return; return;
} }
}
/* if (pwrpriv->pwr_mode == PS_MODE_ACTIVE) */ /* if (pwrpriv->pwr_mode == PS_MODE_ACTIVE) */
if (ps_mode == PS_MODE_ACTIVE) { if (ps_mode == PS_MODE_ACTIVE) {
@ -381,15 +360,12 @@ _func_enter_;
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode)); rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode));
pwrpriv->bFwCurrentInPSMode = false; pwrpriv->bFwCurrentInPSMode = false;
} }
} } else {
else
{
if (PS_RDY_CHECK(padapter)
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
|| (BT_1Ant(padapter) == true) if (PS_RDY_CHECK(padapter) || (BT_1Ant(padapter))) {
#else
if (PS_RDY_CHECK(padapter)) {
#endif #endif
)
{
DBG_88E("%s: Enter 802.11 power save\n", __func__); DBG_88E("%s: Enter 802.11 power save\n", __func__);
pwrpriv->bFwCurrentInPSMode = true; pwrpriv->bFwCurrentInPSMode = true;
pwrpriv->pwr_mode = ps_mode; pwrpriv->pwr_mode = ps_mode;
@ -422,21 +398,18 @@ s32 LPS_RF_ON_check(struct adapter * padapter, u32 delay_ms)
start_time = rtw_get_current_time(); start_time = rtw_get_current_time();
while (1) while (1) {
{
rtw_hal_get_hwreg(padapter, HW_VAR_FWLPS_RF_ON, &bAwake); rtw_hal_get_hwreg(padapter, HW_VAR_FWLPS_RF_ON, &bAwake);
if (true == bAwake) if (bAwake)
break; break;
if (true == padapter->bSurpriseRemoved) if (padapter->bSurpriseRemoved) {
{
err = -2; err = -2;
DBG_88E("%s: device surprise removed!!\n", __func__); DBG_88E("%s: device surprise removed!!\n", __func__);
break; break;
} }
if (rtw_get_passing_time_ms(start_time) > delay_ms) if (rtw_get_passing_time_ms(start_time) > delay_ms) {
{
err = -1; err = -1;
DBG_88E("%s: Wait for FW LPS leave more than %u ms!!!\n", __func__, delay_ms); DBG_88E("%s: Wait for FW LPS leave more than %u ms!!!\n", __func__, delay_ms);
break; break;
@ -462,24 +435,19 @@ _func_enter_;
if (PS_RDY_CHECK(padapter) == false) if (PS_RDY_CHECK(padapter) == false)
return; return;
if (true == pwrpriv->bLeisurePs) if (pwrpriv->bLeisurePs) {
{
/* Idle for a while if we connect to AP a while ago. */ /* Idle for a while if we connect to AP a while ago. */
if (pwrpriv->LpsIdleCount >= 2) /* 4 Sec */ if (pwrpriv->LpsIdleCount >= 2) { /* 4 Sec */
{ if (pwrpriv->pwr_mode == PS_MODE_ACTIVE) {
if (pwrpriv->pwr_mode == PS_MODE_ACTIVE)
{
pwrpriv->bpower_saving = true; pwrpriv->bpower_saving = true;
DBG_88E("%s smart_ps:%d\n", __func__, pwrpriv->smart_ps); DBG_88E("%s smart_ps:%d\n", __func__, pwrpriv->smart_ps);
/* For Tenda W311R IOT issue */ /* For Tenda W311R IOT issue */
rtw_set_ps_mode(padapter, pwrpriv->power_mgnt, pwrpriv->smart_ps, 0); rtw_set_ps_mode(padapter, pwrpriv->power_mgnt, pwrpriv->smart_ps, 0);
} }
} } else {
else
pwrpriv->LpsIdleCount++; pwrpriv->LpsIdleCount++;
} }
}
/* DBG_88E("-LeisurePSEnter\n"); */
_func_exit_; _func_exit_;
} }
@ -498,10 +466,8 @@ void LPS_Leave(struct adapter * padapter)
_func_enter_; _func_enter_;
if (pwrpriv->bLeisurePs) if (pwrpriv->bLeisurePs) {
{ if (pwrpriv->pwr_mode != PS_MODE_ACTIVE) {
if (pwrpriv->pwr_mode != PS_MODE_ACTIVE)
{
rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0); rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0);
if (pwrpriv->pwr_mode == PS_MODE_ACTIVE) if (pwrpriv->pwr_mode == PS_MODE_ACTIVE)
@ -511,8 +477,6 @@ _func_enter_;
pwrpriv->bpower_saving = false; pwrpriv->bpower_saving = false;
/* DBG_88E("-LeisurePSLeave\n"); */
_func_exit_; _func_exit_;
} }
@ -527,8 +491,7 @@ void LeaveAllPowerSaveMode(struct adapter * Adapter)
_func_enter_; _func_enter_;
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) if (check_fwstate(pmlmepriv, _FW_LINKED)) { /* connect */
{ /* connect */
p2p_ps_wk_cmd(Adapter, P2P_PS_DISABLE, enqueue); p2p_ps_wk_cmd(Adapter, P2P_PS_DISABLE, enqueue);
rtw_lps_ctrl_wk_cmd(Adapter, LPS_CTRL_LEAVE, enqueue); rtw_lps_ctrl_wk_cmd(Adapter, LPS_CTRL_LEAVE, enqueue);
@ -639,28 +602,25 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
} }
/* System suspend is not allowed to wakeup */ /* System suspend is not allowed to wakeup */
if ((pwrpriv->bInternalAutoSuspend == false) && (true == pwrpriv->bInSuspend )){ if ((!pwrpriv->bInternalAutoSuspend) && (pwrpriv->bInSuspend)) {
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} }
/* block??? */ /* block??? */
if ((pwrpriv->bInternalAutoSuspend == true) && (padapter->net_closed == true)) { if ((pwrpriv->bInternalAutoSuspend) && (padapter->net_closed)) {
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} }
/* I think this should be check in IPS, LPS, autosuspend functions... */ /* I think this should be check in IPS, LPS, autosuspend functions... */
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) if (check_fwstate(pmlmepriv, _FW_LINKED)) {
{
ret = _SUCCESS; ret = _SUCCESS;
goto exit; goto exit;
} }
if (rf_off == pwrpriv->rf_pwrstate ) if (rf_off == pwrpriv->rf_pwrstate) {
{
DBG_88E("%s call ips_leave....\n", __func__); DBG_88E("%s call ips_leave....\n", __func__);
if (_FAIL == ips_leave(padapter)) if (_FAIL == ips_leave(padapter)) {
{
DBG_88E("======> ips_leave fail.............\n"); DBG_88E("======> ips_leave fail.............\n");
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
@ -668,10 +628,8 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
} }
/* TODO: the following checking need to be merged... */ /* TODO: the following checking need to be merged... */
if (padapter->bDriverStopped if (padapter->bDriverStopped || !padapter->bup ||
|| !padapter->bup !padapter->hw_init_completed) {
|| !padapter->hw_init_completed
){
DBG_88E("%s: bDriverStopped=%d, bup=%d, hw_init_completed =%u\n" DBG_88E("%s: bDriverStopped=%d, bup=%d, hw_init_completed =%u\n"
, caller , caller
, padapter->bDriverStopped , padapter->bDriverStopped
@ -685,7 +643,6 @@ exit:
if (pwrpriv->ips_deny_time < rtw_get_current_time() + rtw_ms_to_systime(ips_deffer_ms)) if (pwrpriv->ips_deny_time < rtw_get_current_time() + rtw_ms_to_systime(ips_deffer_ms))
pwrpriv->ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(ips_deffer_ms); pwrpriv->ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(ips_deffer_ms);
return ret; return ret;
} }
int rtw_pm_set_lps(struct adapter *padapter, u8 mode) int rtw_pm_set_lps(struct adapter *padapter, u8 mode)
@ -693,24 +650,16 @@ int rtw_pm_set_lps(struct adapter *padapter, u8 mode)
int ret = 0; int ret = 0;
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
if ( mode < PS_MODE_NUM ) if (mode < PS_MODE_NUM) {
{ if (pwrctrlpriv->power_mgnt != mode) {
if (pwrctrlpriv->power_mgnt !=mode)
{
if (PS_MODE_ACTIVE == mode) if (PS_MODE_ACTIVE == mode)
{
LeaveAllPowerSaveMode(padapter); LeaveAllPowerSaveMode(padapter);
}
else else
{
pwrctrlpriv->LpsIdleCount = 2; pwrctrlpriv->LpsIdleCount = 2;
}
pwrctrlpriv->power_mgnt = mode; pwrctrlpriv->power_mgnt = mode;
pwrctrlpriv->bLeisurePs = (PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt) ? true : false; pwrctrlpriv->bLeisurePs = (PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt) ? true : false;
} }
} } else {
else
{
ret = -EINVAL; ret = -EINVAL;
} }
@ -725,14 +674,12 @@ int rtw_pm_set_ips(struct adapter *padapter, u8 mode)
rtw_ips_mode_req(pwrctrlpriv, mode); rtw_ips_mode_req(pwrctrlpriv, mode);
DBG_88E("%s %s\n", __func__, mode == IPS_NORMAL ? "IPS_NORMAL" : "IPS_LEVEL_2"); DBG_88E("%s %s\n", __func__, mode == IPS_NORMAL ? "IPS_NORMAL" : "IPS_LEVEL_2");
return 0; return 0;
} } else if (mode == IPS_NONE) {
else if (mode ==IPS_NONE){
rtw_ips_mode_req(pwrctrlpriv, mode); rtw_ips_mode_req(pwrctrlpriv, mode);
DBG_88E("%s %s\n", __func__, "IPS_NONE"); DBG_88E("%s %s\n", __func__, "IPS_NONE");
if ((padapter->bSurpriseRemoved == 0) && (_FAIL == rtw_pwr_wakeup(padapter))) if ((padapter->bSurpriseRemoved == 0) && (_FAIL == rtw_pwr_wakeup(padapter)))
return -EFAULT; return -EFAULT;
} } else {
else {
return -EINVAL; return -EINVAL;
} }
return 0; return 0;