From 7f75913cfb94cc25ac18552ca34d7c0709dab827 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 24 Feb 2015 10:18:56 -0600 Subject: [PATCH] rtl8188eu: Remove CONFIG_IPS This one is always defined. Signed-off-by: Larry Finger --- core/rtw_pwrctrl.c | 10 ---------- core/rtw_sreset.c | 2 -- include/autoconf.h | 1 - include/osdep_intf.h | 2 -- include/rtw_pwrctrl.h | 8 +++----- os_dep/ioctl_linux.c | 8 -------- os_dep/os_intfs.c | 10 +--------- os_dep/usb_intf.c | 2 -- 8 files changed, 4 insertions(+), 39 deletions(-) diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c index 3f7b4c0..6ece1ad 100755 --- a/core/rtw_pwrctrl.c +++ b/core/rtw_pwrctrl.c @@ -29,7 +29,6 @@ #include #endif -#ifdef CONFIG_IPS void _ips_enter(struct adapter * padapter) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); @@ -112,7 +111,6 @@ int ips_leave(struct adapter * padapter) return ret; } -#endif /* CONFIG_IPS */ #ifdef CONFIG_AUTOSUSPEND extern void autosuspend_enter(struct adapter* padapter); @@ -313,9 +311,7 @@ void rtw_ps_processor(struct adapter*padapter) pwrpriv->change_rfpwrstate = rf_off; #endif /* defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND) */ - #ifdef CONFIG_IPS ips_enter(padapter); - #endif } } exit: @@ -816,12 +812,8 @@ void LeaveAllPowerSaveMode(IN struct adapter *Adapter) #endif { #if defined(CONFIG_PLATFORM_SPRD) - #ifdef CONFIG_IPS if(false == ips_leave(Adapter)) - { DBG_871X("======> ips_leave fail.............\n"); - } - #endif #endif /* CONFIG_PLATFORM_SPRD */ } } @@ -1701,7 +1693,6 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal else #endif { -#ifdef CONFIG_IPS DBG_8192C("%s call ips_leave....\n",__FUNCTION__); if(_FAIL == ips_leave(padapter)) { @@ -1709,7 +1700,6 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal ret = _FAIL; goto exit; } -#endif } } diff --git a/core/rtw_sreset.c b/core/rtw_sreset.c index 287e0a6..a432be5 100755 --- a/core/rtw_sreset.c +++ b/core/rtw_sreset.c @@ -292,10 +292,8 @@ void sreset_reset(struct adapter *padapter) sreset_stop_adapter(padapter); - #ifdef CONFIG_IPS _ips_enter(padapter); _ips_leave(padapter); - #endif sreset_start_adapter(padapter); diff --git a/include/autoconf.h b/include/autoconf.h index d625c34..f604a6b 100755 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -32,7 +32,6 @@ #define CONFIG_SUPPORT_USB_INT - #define CONFIG_IPS #define SUPPORT_HW_RFOFF_DETECTED #define CONFIG_LPS diff --git a/include/osdep_intf.h b/include/osdep_intf.h index d7084d7..a0540e6 100755 --- a/include/osdep_intf.h +++ b/include/osdep_intf.h @@ -105,10 +105,8 @@ void rtw_ips_dev_unload(struct adapter *padapter); void rtw_bb_rf_gain_offset(struct adapter *padapter); #endif //CONFIG_RF_GAIN_OFFSET -#ifdef CONFIG_IPS int rtw_ips_pwr_up(struct adapter *padapter); void rtw_ips_pwr_down(struct adapter *padapter); -#endif int rtw_drv_register_netdev(struct adapter *padapter); void rtw_ndev_destructor(_nic_hdl ndev); diff --git a/include/rtw_pwrctrl.h b/include/rtw_pwrctrl.h index c01d403..b1394af 100755 --- a/include/rtw_pwrctrl.h +++ b/include/rtw_pwrctrl.h @@ -317,15 +317,13 @@ extern void cpwm_int_hdl(struct adapter *padapter, struct reportpwrstate_parm *p extern void LPS_Leave_check(struct adapter *padapter); #endif -extern void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode); -extern void rtw_set_rpwm(struct adapter * padapter, u8 val8); -extern void LeaveAllPowerSaveMode(struct adapter *Adapter); -#ifdef CONFIG_IPS +void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode); +void rtw_set_rpwm(struct adapter * padapter, u8 val8); +void LeaveAllPowerSaveMode(struct adapter *Adapter); void _ips_enter(struct adapter * padapter); void ips_enter(struct adapter * padapter); int _ips_leave(struct adapter * padapter); int ips_leave(struct adapter * padapter); -#endif void rtw_ps_processor(struct adapter*padapter); diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index a0936ee..ebb6f34 100755 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -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 diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index 6cebca2..a9c9925 100755 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -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; } diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index 4af71dc..0a3de4a 100755 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -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;