staging: rtl8723au: bInternalAutoSuspend is always false

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_pwrctrl.c b/drivers/staging/rtl8723au/core/rtw_pwrctrl.c
index 90359d1a092339ba1de8e178a950b2d8014b5570..86ce51f849e90d293007cccb810c45c3ada6ec9f 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723au/core/rtw_pwrctrl.c
@@ -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_cnts = 0;
-       pwrctrlpriv->bInternalAutoSuspend = false;
        pwrctrlpriv->bInSuspend = false;
        pwrctrlpriv->bkeepfwalive = false;
 
@@ -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__);
        }
 
-       if (pwrpriv->bInternalAutoSuspend == false && pwrpriv->bInSuspend) {
+       if (pwrpriv->bInSuspend) {
                DBG_8723A("%s wait bInSuspend...\n", __func__);
                while (pwrpriv->bInSuspend &&
                       (jiffies_to_msecs(jiffies - start) <= 3000)) {
@@ -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 */
-       if (pwrpriv->bInternalAutoSuspend == false &&
-           pwrpriv->bInSuspend == true) {
-               ret = _FAIL;
-               goto exit;
-       }
-
-       /* block??? */
-       if (pwrpriv->bInternalAutoSuspend == true &&
-           padapter->net_closed == true) {
+       if (pwrpriv->bInSuspend) {
                ret = _FAIL;
                goto exit;
        }

diff --git a/drivers/staging/rtl8723au/include/rtw_pwrctrl.h b/drivers/staging/rtl8723au/include/rtw_pwrctrl.h
index 44a7d4f97e0947f18b07c24c964ae4c4ffdd6e5a..a458af978145e522a9d348931868dbbff3f7fabe 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_pwrctrl.h
+++ b/drivers/staging/rtl8723au/include/rtw_pwrctrl.h
@@ -191,7 +191,6 @@ struct pwrctrl_priv {
        s32             pnp_current_pwr_state;
        u8              pnp_bstop_trx;
 
-       u8              bInternalAutoSuspend;
        u8              bInSuspend;
 #ifdef CONFIG_8723AU_BT_COEXIST
        u8              bAutoResume;

diff --git a/drivers/staging/rtl8723au/os_dep/os_intfs.c b/drivers/staging/rtl8723au/os_dep/os_intfs.c
index d572f643ba595094f025404923d0f0cd4ac0782c..5b27eb4474ba771cfe69f5dc42e4ae73cb07cc56 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723au/os_dep/os_intfs.c
@@ -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"));
 
-       if (padapter->pwrctrlpriv.bInternalAutoSuspend) {
-               if (padapter->pwrctrlpriv.rf_pwrstate == rf_off)
-                       padapter->pwrctrlpriv.ps_flag = true;
-       }
        padapter->net_closed = true;
 
        if (padapter->pwrctrlpriv.rf_pwrstate == rf_on) {

diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c
index f78be19aa3338ae4b583dc2ee1f999ea5f579fd1..8b25c1aa2025c785f5a57fae0a15923629ef96ea 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c
@@ -314,8 +314,7 @@ static void rtw_dev_unload(struct rtw_adapter *padapter)
                rtl8723a_usb_intf_stop(padapter);
 
                /* s4. */
-               if (!padapter->pwrctrlpriv.bInternalAutoSuspend)
-                       flush_workqueue(padapter->cmdpriv.wq);
+               flush_workqueue(padapter->cmdpriv.wq);
 
                /* s5. */
                if (!padapter->bSurpriseRemoved) {
@@ -505,13 +504,9 @@ static int rtw_resume(struct usb_interface *pusb_intf)
 {
        struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
        struct rtw_adapter *padapter = dvobj->if1;
-       struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
-       int ret = 0;
+       int ret;
 
-       if (pwrpriv->bInternalAutoSuspend)
-               ret = rtw_resume_process23a(padapter);
-       else
-               ret = rtw_resume_process23a(padapter);
+       ret = rtw_resume_process23a(padapter);
 
        return ret;
 }