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

staging: rtl8723au: pnp_bstop_trx is never set

In addition remove unused pnp_current_pwr_state
Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 46eff739
...@@ -34,10 +34,9 @@ static int usbctrl_vendorreq(struct rtw_adapter *padapter, u8 request, ...@@ -34,10 +34,9 @@ static int usbctrl_vendorreq(struct rtw_adapter *padapter, u8 request,
u8 *pIo_buf; u8 *pIo_buf;
int vendorreq_times = 0; int vendorreq_times = 0;
if (padapter->bSurpriseRemoved || padapter->pwrctrlpriv.pnp_bstop_trx) { if (padapter->bSurpriseRemoved) {
RT_TRACE(_module_hci_ops_os_c_, _drv_err_, RT_TRACE(_module_hci_ops_os_c_, _drv_err_,
("usbctrl_vendorreq:(padapter->bSurpriseRemoved||" ("usbctrl_vendorreq:(padapter->bSurpriseRemoved)!!!"));
"adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n"));
status = -EPERM; status = -EPERM;
goto exit; goto exit;
} }
...@@ -743,12 +742,10 @@ int rtl8723au_read_port(struct rtw_adapter *adapter, u32 addr, u32 cnt, ...@@ -743,12 +742,10 @@ int rtl8723au_read_port(struct rtw_adapter *adapter, u32 addr, u32 cnt,
struct recv_priv *precvpriv = &adapter->recvpriv; struct recv_priv *precvpriv = &adapter->recvpriv;
struct usb_device *pusbd = pdvobj->pusbdev; struct usb_device *pusbd = pdvobj->pusbdev;
if (adapter->bDriverStopped || adapter->bSurpriseRemoved || if (adapter->bDriverStopped || adapter->bSurpriseRemoved) {
adapter->pwrctrlpriv.pnp_bstop_trx) {
RT_TRACE(_module_hci_ops_os_c_, _drv_err_, RT_TRACE(_module_hci_ops_os_c_, _drv_err_,
("usb_read_port:(padapter->bDriverStopped ||" ("usb_read_port:(padapter->bDriverStopped ||"
"padapter->bSurpriseRemoved ||adapter->" "padapter->bSurpriseRemoved)!!!\n"));
"pwrctrlpriv.pnp_bstop_trx)!!!\n"));
return _FAIL; return _FAIL;
} }
......
...@@ -184,8 +184,6 @@ struct pwrctrl_priv { ...@@ -184,8 +184,6 @@ struct pwrctrl_priv {
u8 bFwCurrentInPSMode; u8 bFwCurrentInPSMode;
unsigned long DelayLPSLastTimeStamp; unsigned long DelayLPSLastTimeStamp;
u8 btcoex_rfon; u8 btcoex_rfon;
s32 pnp_current_pwr_state;
u8 pnp_bstop_trx;
u8 bInSuspend; u8 bInSuspend;
#ifdef CONFIG_8723AU_BT_COEXIST #ifdef CONFIG_8723AU_BT_COEXIST
......
...@@ -153,12 +153,10 @@ int rtl8723au_write_port(struct rtw_adapter *padapter, u32 addr, u32 cnt, ...@@ -153,12 +153,10 @@ int rtl8723au_write_port(struct rtw_adapter *padapter, u32 addr, u32 cnt,
RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("+usb_write_port23a\n")); RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("+usb_write_port23a\n"));
if (padapter->bDriverStopped || padapter->bSurpriseRemoved || if (padapter->bDriverStopped || padapter->bSurpriseRemoved) {
padapter->pwrctrlpriv.pnp_bstop_trx) {
RT_TRACE(_module_hci_ops_os_c_, _drv_err_, RT_TRACE(_module_hci_ops_os_c_, _drv_err_,
("usb_write_port23a:( padapter->bDriverStopped || " ("%s:(padapter->bDriverStopped || "
"padapter->bSurpriseRemoved || " "padapter->bSurpriseRemoved)!!!\n", __func__));
"adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n"));
rtw23a_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_TX_DENY); rtw23a_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_TX_DENY);
goto exit; goto exit;
} }
......
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