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

staging: rtl8723au: Fold rtw_init_io_priv23a() into rtl8723au_set_intf_ops()

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e32c7cd0
...@@ -213,21 +213,3 @@ void _rtw_write_port23a_cancel(struct rtw_adapter *adapter) ...@@ -213,21 +213,3 @@ void _rtw_write_port23a_cancel(struct rtw_adapter *adapter)
if (_write_port_cancel) if (_write_port_cancel)
_write_port_cancel(pintfhdl); _write_port_cancel(pintfhdl);
} }
int rtw_init_io_priv23a(struct rtw_adapter *padapter,
void (*set_intf_ops)(struct _io_ops *pops))
{
struct io_priv *piopriv = &padapter->iopriv;
struct intf_hdl *pintf = &piopriv->intf;
if (set_intf_ops == NULL)
return _FAIL;
piopriv->padapter = padapter;
pintf->padapter = padapter;
pintf->pintf_dev = adapter_to_dvobj(padapter);
set_intf_ops(&pintf->io_ops);
return _SUCCESS;
}
...@@ -815,8 +815,15 @@ void rtl8723au_xmit_tasklet(void *priv) ...@@ -815,8 +815,15 @@ void rtl8723au_xmit_tasklet(void *priv)
} }
} }
void rtl8723au_set_intf_ops(struct _io_ops *pops) void rtl8723au_set_intf_ops(struct rtw_adapter *padapter)
{ {
struct io_priv *piopriv = &padapter->iopriv;
struct intf_hdl *pintf = &piopriv->intf;
struct _io_ops *pops = &pintf->io_ops;
piopriv->padapter = padapter;
pintf->padapter = padapter;
pintf->pintf_dev = adapter_to_dvobj(padapter);
memset((u8 *)pops, 0, sizeof(struct _io_ops)); memset((u8 *)pops, 0, sizeof(struct _io_ops));
......
...@@ -373,8 +373,6 @@ void ioreq_write8(struct rtw_adapter *adapter, u32 addr, u8 val); ...@@ -373,8 +373,6 @@ void ioreq_write8(struct rtw_adapter *adapter, u32 addr, u8 val);
void ioreq_write16(struct rtw_adapter *adapter, u32 addr, u16 val); void ioreq_write16(struct rtw_adapter *adapter, u32 addr, u16 val);
void ioreq_write32(struct rtw_adapter *adapter, u32 addr, u32 val); void ioreq_write32(struct rtw_adapter *adapter, u32 addr, u32 val);
int rtw_init_io_priv23a(struct rtw_adapter *padapter, void (*set_intf_ops)(struct _io_ops *pops));
uint alloc_io_queue(struct rtw_adapter *adapter); uint alloc_io_queue(struct rtw_adapter *adapter);
void free_io_queue(struct rtw_adapter *adapter); void free_io_queue(struct rtw_adapter *adapter);
void async_bus_io(struct io_queue *pio_q); void async_bus_io(struct io_queue *pio_q);
......
...@@ -45,7 +45,7 @@ enum { ...@@ -45,7 +45,7 @@ enum {
void rtl8723au_set_hw_type(struct rtw_adapter *padapter); void rtl8723au_set_hw_type(struct rtw_adapter *padapter);
#define hal_set_hw_type rtl8723au_set_hw_type #define hal_set_hw_type rtl8723au_set_hw_type
void rtl8723au_set_intf_ops(struct _io_ops *pops); void rtl8723au_set_intf_ops(struct rtw_adapter *padapter);
void rtl8723au_recv_tasklet(void *priv); void rtl8723au_recv_tasklet(void *priv);
......
...@@ -623,7 +623,7 @@ static struct rtw_adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, ...@@ -623,7 +623,7 @@ static struct rtw_adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
padapter->intf_stop = &usb_intf_stop; padapter->intf_stop = &usb_intf_stop;
/* step init_io_priv */ /* step init_io_priv */
rtw_init_io_priv23a(padapter, rtl8723au_set_intf_ops); rtl8723au_set_intf_ops(padapter);
/* step read_chip_version */ /* step read_chip_version */
rtw_hal_read_chip_version23a(padapter); rtw_hal_read_chip_version23a(padapter);
......
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