mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-04 02:34:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen
2014-05-16 10:05:07 +02:00
committed by Greg Kroah-Hartman
parent 633475cf5e
commit 1c1bc5f1dd
4 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/rtl8723au/hal/usb_halinit.c
View File

@@ -1218,9 +1218,7 @@ int rtl8723au_inirp_init(struct rtw_adapter *Adapter)
u8 i;
struct recv_buf *precvbuf;
int status;
struct _io_ops *io_ops = &Adapter->io_ops;
struct recv_priv *precvpriv = &Adapter->recvpriv;
int (*_read_interrupt)(struct rtw_adapter *padapter, u32 addr);
struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
status = _SUCCESS;
@@ -1239,8 +1237,7 @@ int rtl8723au_inirp_init(struct rtw_adapter *Adapter)
}
precvbuf++;
}
_read_interrupt = io_ops->_read_interrupt;
if (_read_interrupt(Adapter, RECV_INT_IN_ADDR) == _FAIL) {
if (rtl8723a_usb_read_interrupt(Adapter, RECV_INT_IN_ADDR) == _FAIL) {
RT_TRACE(_module_hci_hal_init_c_, _drv_err_,
("usb_rx_init: usb_read_interrupt error\n"));
status = _FAIL;

4
drivers/staging/rtl8723au/hal/usb_ops_linux.c
View File

@@ -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;
unsigned int pipe;
@@ -847,8 +847,6 @@ void rtl8723au_set_intf_ops(struct rtw_adapter *padapter)
pops->_write16 = &usb_write16;
pops->_write32 = &usb_write32;
pops->_writeN = &usb_writeN;
pops->_read_interrupt = &usb_read_interrupt;
}
void rtl8723au_set_hw_type(struct rtw_adapter *padapter)

2
drivers/staging/rtl8723au/include/rtw_io.h
View File

@@ -109,8 +109,6 @@ struct _io_ops
int (*_write32)(struct rtw_adapter *adapter, u32 addr, u32 val);
int (*_writeN)(struct rtw_adapter *adapter, u32 addr, u32 length,
u8 *pdata);
int (*_read_interrupt)(struct rtw_adapter *adapter, u32 addr);
};
struct io_req {

1
drivers/staging/rtl8723au/include/usb_ops_linux.h
View File

@@ -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,
struct xmit_buf *pxmitbuf);
void rtl8723a_usb_write_port_cancel(struct rtw_adapter *padapter);
int rtl8723a_usb_read_interrupt(struct rtw_adapter *adapter, u32 addr);
#endif