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

staging: rtl8723au: Call usb_read_interrupt() directly instead of via HAL layer

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 633475cf
...@@ -1218,9 +1218,7 @@ int rtl8723au_inirp_init(struct rtw_adapter *Adapter) ...@@ -1218,9 +1218,7 @@ int rtl8723au_inirp_init(struct rtw_adapter *Adapter)
u8 i; u8 i;
struct recv_buf *precvbuf; struct recv_buf *precvbuf;
int status; int status;
struct _io_ops *io_ops = &Adapter->io_ops;
struct recv_priv *precvpriv = &Adapter->recvpriv; struct recv_priv *precvpriv = &Adapter->recvpriv;
int (*_read_interrupt)(struct rtw_adapter *padapter, u32 addr);
struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
status = _SUCCESS; status = _SUCCESS;
...@@ -1239,8 +1237,7 @@ int rtl8723au_inirp_init(struct rtw_adapter *Adapter) ...@@ -1239,8 +1237,7 @@ int rtl8723au_inirp_init(struct rtw_adapter *Adapter)
} }
precvbuf++; precvbuf++;
} }
_read_interrupt = io_ops->_read_interrupt; if (rtl8723a_usb_read_interrupt(Adapter, RECV_INT_IN_ADDR) == _FAIL) {
if (_read_interrupt(Adapter, RECV_INT_IN_ADDR) == _FAIL) {
RT_TRACE(_module_hci_hal_init_c_, _drv_err_, RT_TRACE(_module_hci_hal_init_c_, _drv_err_,
("usb_rx_init: usb_read_interrupt error\n")); ("usb_rx_init: usb_read_interrupt error\n"));
status = _FAIL; status = _FAIL;
......
...@@ -447,7 +447,7 @@ static void usb_read_interrupt_complete(struct urb *purb) ...@@ -447,7 +447,7 @@ static void usb_read_interrupt_complete(struct urb *purb)
} }
} }
static int usb_read_interrupt(struct rtw_adapter *adapter, u32 addr) int rtl8723a_usb_read_interrupt(struct rtw_adapter *adapter, u32 addr)
{ {
int err; int err;
unsigned int pipe; unsigned int pipe;
...@@ -847,8 +847,6 @@ void rtl8723au_set_intf_ops(struct rtw_adapter *padapter) ...@@ -847,8 +847,6 @@ void rtl8723au_set_intf_ops(struct rtw_adapter *padapter)
pops->_write16 = &usb_write16; pops->_write16 = &usb_write16;
pops->_write32 = &usb_write32; pops->_write32 = &usb_write32;
pops->_writeN = &usb_writeN; pops->_writeN = &usb_writeN;
pops->_read_interrupt = &usb_read_interrupt;
} }
void rtl8723au_set_hw_type(struct rtw_adapter *padapter) void rtl8723au_set_hw_type(struct rtw_adapter *padapter)
......
...@@ -109,8 +109,6 @@ struct _io_ops ...@@ -109,8 +109,6 @@ struct _io_ops
int (*_write32)(struct rtw_adapter *adapter, u32 addr, u32 val); int (*_write32)(struct rtw_adapter *adapter, u32 addr, u32 val);
int (*_writeN)(struct rtw_adapter *adapter, u32 addr, u32 length, int (*_writeN)(struct rtw_adapter *adapter, u32 addr, u32 length,
u8 *pdata); u8 *pdata);
int (*_read_interrupt)(struct rtw_adapter *adapter, u32 addr);
}; };
struct io_req { struct io_req {
......
...@@ -27,5 +27,6 @@ void rtl8723a_usb_read_port_cancel(struct rtw_adapter *padapter); ...@@ -27,5 +27,6 @@ void rtl8723a_usb_read_port_cancel(struct rtw_adapter *padapter);
int rtl8723a_usb_write_port(struct rtw_adapter *padapter, u32 addr, u32 cnt, int rtl8723a_usb_write_port(struct rtw_adapter *padapter, u32 addr, u32 cnt,
struct xmit_buf *pxmitbuf); struct xmit_buf *pxmitbuf);
void rtl8723a_usb_write_port_cancel(struct rtw_adapter *padapter); void rtl8723a_usb_write_port_cancel(struct rtw_adapter *padapter);
int rtl8723a_usb_read_interrupt(struct rtw_adapter *adapter, u32 addr);
#endif #endif
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