staging: rtl8723au: Remove HAL wrappers about USB init/deinit
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
44e621c7a6
commit
1aaa37613f
|
@ -129,26 +129,6 @@ void rtw_hal_disable_interrupt23a(struct rtw_adapter *padapter)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 rtw_hal_inirp_init23a(struct rtw_adapter *padapter)
|
|
||||||
{
|
|
||||||
u32 rst = _FAIL;
|
|
||||||
if (padapter->HalFunc.inirp_init)
|
|
||||||
rst = padapter->HalFunc.inirp_init(padapter);
|
|
||||||
else
|
|
||||||
DBG_8723A(" %s HalFunc.inirp_init is NULL!!!\n", __FUNCTION__);
|
|
||||||
return rst;
|
|
||||||
}
|
|
||||||
|
|
||||||
u32 rtw_hal_inirp_deinit23a(struct rtw_adapter *padapter)
|
|
||||||
{
|
|
||||||
|
|
||||||
if (padapter->HalFunc.inirp_deinit)
|
|
||||||
return padapter->HalFunc.inirp_deinit(padapter);
|
|
||||||
|
|
||||||
return _FAIL;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 rtw_hal_xmit23aframe_enqueue(struct rtw_adapter *padapter, struct xmit_frame *pxmitframe)
|
s32 rtw_hal_xmit23aframe_enqueue(struct rtw_adapter *padapter, struct xmit_frame *pxmitframe)
|
||||||
{
|
{
|
||||||
if (padapter->HalFunc.hal_xmitframe_enqueue)
|
if (padapter->HalFunc.hal_xmitframe_enqueue)
|
||||||
|
|
|
@ -1222,11 +1222,11 @@ static u32 rtl8723au_hal_deinit(struct rtw_adapter *padapter)
|
||||||
return _SUCCESS;
|
return _SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned int rtl8723au_inirp_init(struct rtw_adapter *Adapter)
|
int rtl8723au_inirp_init(struct rtw_adapter *Adapter)
|
||||||
{
|
{
|
||||||
u8 i;
|
u8 i;
|
||||||
struct recv_buf *precvbuf;
|
struct recv_buf *precvbuf;
|
||||||
uint status;
|
int status;
|
||||||
struct _io_ops *io_ops = &Adapter->io_ops;
|
struct _io_ops *io_ops = &Adapter->io_ops;
|
||||||
struct recv_priv *precvpriv = &Adapter->recvpriv;
|
struct recv_priv *precvpriv = &Adapter->recvpriv;
|
||||||
u32 (*_read_port)(struct rtw_adapter *padapter, u32 addr, u32 cnt,
|
u32 (*_read_port)(struct rtw_adapter *padapter, u32 addr, u32 cnt,
|
||||||
|
@ -1270,7 +1270,7 @@ exit:
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned int rtl8723au_inirp_deinit(struct rtw_adapter *Adapter)
|
int rtl8723au_inirp_deinit(struct rtw_adapter *Adapter)
|
||||||
{
|
{
|
||||||
struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
|
struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
|
||||||
|
|
||||||
|
@ -1738,9 +1738,6 @@ int rtl8723au_set_hal_ops(struct rtw_adapter *padapter)
|
||||||
pHalFunc->hal_init = &rtl8723au_hal_init;
|
pHalFunc->hal_init = &rtl8723au_hal_init;
|
||||||
pHalFunc->hal_deinit = &rtl8723au_hal_deinit;
|
pHalFunc->hal_deinit = &rtl8723au_hal_deinit;
|
||||||
|
|
||||||
pHalFunc->inirp_init = &rtl8723au_inirp_init;
|
|
||||||
pHalFunc->inirp_deinit = &rtl8723au_inirp_deinit;
|
|
||||||
|
|
||||||
pHalFunc->init_xmit_priv = &rtl8723au_init_xmit_priv;
|
pHalFunc->init_xmit_priv = &rtl8723au_init_xmit_priv;
|
||||||
|
|
||||||
pHalFunc->init_recv_priv = &rtl8723au_init_recv_priv;
|
pHalFunc->init_recv_priv = &rtl8723au_init_recv_priv;
|
||||||
|
|
|
@ -67,9 +67,6 @@ struct hal_ops {
|
||||||
|
|
||||||
void (*free_hal_data)(struct rtw_adapter *padapter);
|
void (*free_hal_data)(struct rtw_adapter *padapter);
|
||||||
|
|
||||||
u32 (*inirp_init)(struct rtw_adapter *padapter);
|
|
||||||
u32 (*inirp_deinit)(struct rtw_adapter *padapter);
|
|
||||||
|
|
||||||
s32 (*init_xmit_priv)(struct rtw_adapter *padapter);
|
s32 (*init_xmit_priv)(struct rtw_adapter *padapter);
|
||||||
|
|
||||||
s32 (*init_recv_priv)(struct rtw_adapter *padapter);
|
s32 (*init_recv_priv)(struct rtw_adapter *padapter);
|
||||||
|
@ -205,9 +202,6 @@ void rtw_hal_get_odm_var23a(struct rtw_adapter *padapter,
|
||||||
void rtw_hal_enable_interrupt23a(struct rtw_adapter *padapter);
|
void rtw_hal_enable_interrupt23a(struct rtw_adapter *padapter);
|
||||||
void rtw_hal_disable_interrupt23a(struct rtw_adapter *padapter);
|
void rtw_hal_disable_interrupt23a(struct rtw_adapter *padapter);
|
||||||
|
|
||||||
u32 rtw_hal_inirp_init23a(struct rtw_adapter *padapter);
|
|
||||||
u32 rtw_hal_inirp_deinit23a(struct rtw_adapter *padapter);
|
|
||||||
|
|
||||||
s32 rtw_hal_xmit23aframe_enqueue(struct rtw_adapter *padapter,
|
s32 rtw_hal_xmit23aframe_enqueue(struct rtw_adapter *padapter,
|
||||||
struct xmit_frame *pxmitframe);
|
struct xmit_frame *pxmitframe);
|
||||||
s32 rtw_hal_xmit23a(struct rtw_adapter *padapter,
|
s32 rtw_hal_xmit23a(struct rtw_adapter *padapter,
|
||||||
|
|
|
@ -92,5 +92,7 @@ static inline u8 rtw_usb_bulk_size_boundary(struct rtw_adapter *padapter,
|
||||||
return rst;
|
return rst;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int rtl8723au_inirp_init(struct rtw_adapter *Adapter);
|
||||||
|
int rtl8723au_inirp_deinit(struct rtw_adapter *Adapter);
|
||||||
|
|
||||||
#endif /* __USB_OPS_H_ */
|
#endif /* __USB_OPS_H_ */
|
||||||
|
|
|
@ -289,7 +289,7 @@ static void decide_chip_type_by_usb_device_id(struct rtw_adapter *padapter,
|
||||||
static void usb_intf_start(struct rtw_adapter *padapter)
|
static void usb_intf_start(struct rtw_adapter *padapter)
|
||||||
{
|
{
|
||||||
RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_start\n"));
|
RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_start\n"));
|
||||||
rtw_hal_inirp_init23a(padapter);
|
rtl8723au_inirp_init(padapter);
|
||||||
RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-usb_intf_start\n"));
|
RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-usb_intf_start\n"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -307,7 +307,7 @@ static void usb_intf_stop(struct rtw_adapter *padapter)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* cancel in irp */
|
/* cancel in irp */
|
||||||
rtw_hal_inirp_deinit23a(padapter);
|
rtl8723au_inirp_deinit(padapter);
|
||||||
|
|
||||||
/* cancel out irp */
|
/* cancel out irp */
|
||||||
rtw_write_port_cancel(padapter);
|
rtw_write_port_cancel(padapter);
|
||||||
|
|
Loading…
Reference in a new issue