rtl8188eu: Remove CONFIG_IPS

This one is always defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-02-24 10:18:56 -06:00
parent d9320ea25b
commit 7f75913cfb
8 changed files with 4 additions and 39 deletions

View file

@ -8349,10 +8349,8 @@ static int rtw_mp_efuse_get(struct net_device *dev,
rtw_pm_set_lps(padapter,PS_MODE_ACTIVE);
#endif
#ifdef CONFIG_IPS
ips_mode = pwrctrlpriv->ips_mode;/* keep org value */
rtw_pm_set_ips(padapter,IPS_NONE);
#endif
pch = extra;
DBG_871X("%s: in=%s\n", __FUNCTION__, extra);
@ -8835,9 +8833,7 @@ exit:
if (!err)
wrqu->length = strlen(extra);
#ifdef CONFIG_IPS
rtw_pm_set_ips(padapter, ips_mode);
#endif
#ifdef CONFIG_LPS
rtw_pm_set_lps(padapter, lps_mode);
#endif
@ -8904,10 +8900,8 @@ static int rtw_mp_efuse_set(struct net_device *dev,
rtw_pm_set_lps(padapter,PS_MODE_ACTIVE);
#endif
#ifdef CONFIG_IPS
ips_mode = pwrctrlpriv->ips_mode;/* keep org value */
rtw_pm_set_ips(padapter,IPS_NONE);
#endif
pch = extra;
DBG_871X("%s: in=%s\n", __FUNCTION__, extra);
@ -9284,9 +9278,7 @@ exit:
if (setrawdata)
rtw_mfree(setrawdata, EFUSE_MAX_SIZE);
#ifdef CONFIG_IPS
rtw_pm_set_ips(padapter, ips_mode);
#endif
#ifdef CONFIG_LPS
rtw_pm_set_lps(padapter, lps_mode);
#endif

View file

@ -69,11 +69,7 @@ static int rtw_soft_ap = 0;
/* int smart_ps = 1; */
#ifdef CONFIG_POWER_SAVING
static int rtw_power_mgnt = 1;
#ifdef CONFIG_IPS_LEVEL_2
static int rtw_ips_mode = IPS_LEVEL_2;
#else
static int rtw_ips_mode = IPS_NORMAL;
#endif
#else
static int rtw_power_mgnt = PS_MODE_ACTIVE;
static int rtw_ips_mode = IPS_NONE;
@ -1386,7 +1382,6 @@ int netdev_open(struct net_device *pnetdev)
return ret;
}
#ifdef CONFIG_IPS
static int ips_netdrv_open(struct adapter *padapter)
{
int status = _SUCCESS;
@ -1457,7 +1452,7 @@ void rtw_ips_pwr_down(struct adapter *padapter)
padapter->bCardDisableWOHSM = false;
DBG_871X("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time));
}
#endif
void rtw_ips_dev_unload(struct adapter *padapter)
{
struct net_device *pnetdev= (struct net_device*)padapter->pnetdev;
@ -1517,11 +1512,8 @@ int pm_netdev_open(struct net_device *pnetdev,u8 bnormal)
if (true == bnormal)
status = netdev_open(pnetdev);
#ifdef CONFIG_IPS
else
status = (_SUCCESS == ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev)))?(0):(-1);
#endif
return status;
}

View file

@ -605,9 +605,7 @@ int rtw_hw_suspend(struct adapter *padapter )
/* s2-4. */
rtw_free_network_queue(padapter,true);
#ifdef CONFIG_IPS
rtw_ips_dev_unload(padapter);
#endif
pwrpriv->rf_pwrstate = rf_off;
pwrpriv->bips_processing = false;