Commit 32dfcb1b authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

staging: rtl8723au: bInternalAutoSuspend is always false

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e6d880db
...@@ -481,7 +481,6 @@ void rtw_init_pwrctrl_priv23a(struct rtw_adapter *padapter) ...@@ -481,7 +481,6 @@ void rtw_init_pwrctrl_priv23a(struct rtw_adapter *padapter)
pwrctrlpriv->pwr_state_check_interval = RTW_PWR_STATE_CHK_INTERVAL; pwrctrlpriv->pwr_state_check_interval = RTW_PWR_STATE_CHK_INTERVAL;
pwrctrlpriv->pwr_state_check_cnts = 0; pwrctrlpriv->pwr_state_check_cnts = 0;
pwrctrlpriv->bInternalAutoSuspend = false;
pwrctrlpriv->bInSuspend = false; pwrctrlpriv->bInSuspend = false;
pwrctrlpriv->bkeepfwalive = false; pwrctrlpriv->bkeepfwalive = false;
...@@ -562,7 +561,7 @@ int _rtw_pwr_wakeup23a(struct rtw_adapter *padapter, u32 ips_deffer_ms, const ch ...@@ -562,7 +561,7 @@ int _rtw_pwr_wakeup23a(struct rtw_adapter *padapter, u32 ips_deffer_ms, const ch
DBG_8723A("%s wait sreset_inprogress done\n", __func__); DBG_8723A("%s wait sreset_inprogress done\n", __func__);
} }
if (pwrpriv->bInternalAutoSuspend == false && pwrpriv->bInSuspend) { if (pwrpriv->bInSuspend) {
DBG_8723A("%s wait bInSuspend...\n", __func__); DBG_8723A("%s wait bInSuspend...\n", __func__);
while (pwrpriv->bInSuspend && while (pwrpriv->bInSuspend &&
(jiffies_to_msecs(jiffies - start) <= 3000)) { (jiffies_to_msecs(jiffies - start) <= 3000)) {
...@@ -575,15 +574,7 @@ int _rtw_pwr_wakeup23a(struct rtw_adapter *padapter, u32 ips_deffer_ms, const ch ...@@ -575,15 +574,7 @@ int _rtw_pwr_wakeup23a(struct rtw_adapter *padapter, u32 ips_deffer_ms, const ch
} }
/* System suspend is not allowed to wakeup */ /* System suspend is not allowed to wakeup */
if (pwrpriv->bInternalAutoSuspend == false && if (pwrpriv->bInSuspend) {
pwrpriv->bInSuspend == true) {
ret = _FAIL;
goto exit;
}
/* block??? */
if (pwrpriv->bInternalAutoSuspend == true &&
padapter->net_closed == true) {
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} }
......
...@@ -191,7 +191,6 @@ struct pwrctrl_priv { ...@@ -191,7 +191,6 @@ struct pwrctrl_priv {
s32 pnp_current_pwr_state; s32 pnp_current_pwr_state;
u8 pnp_bstop_trx; u8 pnp_bstop_trx;
u8 bInternalAutoSuspend;
u8 bInSuspend; u8 bInSuspend;
#ifdef CONFIG_8723AU_BT_COEXIST #ifdef CONFIG_8723AU_BT_COEXIST
u8 bAutoResume; u8 bAutoResume;
......
...@@ -835,10 +835,6 @@ static int netdev_close(struct net_device *pnetdev) ...@@ -835,10 +835,6 @@ static int netdev_close(struct net_device *pnetdev)
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+871x_drv - drv_close\n")); RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+871x_drv - drv_close\n"));
if (padapter->pwrctrlpriv.bInternalAutoSuspend) {
if (padapter->pwrctrlpriv.rf_pwrstate == rf_off)
padapter->pwrctrlpriv.ps_flag = true;
}
padapter->net_closed = true; padapter->net_closed = true;
if (padapter->pwrctrlpriv.rf_pwrstate == rf_on) { if (padapter->pwrctrlpriv.rf_pwrstate == rf_on) {
......
...@@ -314,7 +314,6 @@ static void rtw_dev_unload(struct rtw_adapter *padapter) ...@@ -314,7 +314,6 @@ static void rtw_dev_unload(struct rtw_adapter *padapter)
rtl8723a_usb_intf_stop(padapter); rtl8723a_usb_intf_stop(padapter);
/* s4. */ /* s4. */
if (!padapter->pwrctrlpriv.bInternalAutoSuspend)
flush_workqueue(padapter->cmdpriv.wq); flush_workqueue(padapter->cmdpriv.wq);
/* s5. */ /* s5. */
...@@ -505,12 +504,8 @@ static int rtw_resume(struct usb_interface *pusb_intf) ...@@ -505,12 +504,8 @@ static int rtw_resume(struct usb_interface *pusb_intf)
{ {
struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf); struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
struct rtw_adapter *padapter = dvobj->if1; struct rtw_adapter *padapter = dvobj->if1;
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; int ret;
int ret = 0;
if (pwrpriv->bInternalAutoSuspend)
ret = rtw_resume_process23a(padapter);
else
ret = rtw_resume_process23a(padapter); ret = rtw_resume_process23a(padapter);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment