staging: rtl8723au: bInternalAutoSuspend is always false (32dfcb1b) · Commits · 戴 / test

drivers/staging/rtl8723au/core/rtw_pwrctrl.c

+2 −11

Original line number	Diff line number	Diff line
		@@ -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;
		}

+0 −1

+0 −4

Original line number	Diff line number	Diff line
		@@ -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) {

+3 −8

Original line number	Diff line number	Diff line
		@@ -314,7 +314,6 @@ static void rtw_dev_unload(struct rtw_adapter *padapter)
		rtl8723a_usb_intf_stop(padapter);

		/* s4. */
		if (!padapter->pwrctrlpriv.bInternalAutoSuspend)
		flush_workqueue(padapter->cmdpriv.wq);

		/* s5. */
		@@ -505,12 +504,8 @@ 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);

		return ret;