Commit 520106f6 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Get rid of struct io_priv 



No point wrapping struct intf_hdl into struct io_priv just for the
sake of it.

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1dbe119b

drivers/staging/rtl8723au/core/rtw_io.c

+14 −26
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ jackson@realtek.com.tw 
u8 _rtw_read823a(struct rtw_adapter *adapter, u32 addr)

{

	u8 r_val;

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &pio_priv->intf;

	struct intf_hdl *pintfhdl = &adapter->intf;



	r_val = pintfhdl->io_ops._read8(pintfhdl, addr);
@@ -55,8 +54,7 @@ u8 _rtw_read823a(struct rtw_adapter *adapter, u32 addr) 
u16 _rtw_read1623a(struct rtw_adapter *adapter, u32 addr)

{

	u16 r_val;

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &pio_priv->intf;

	struct intf_hdl *pintfhdl = &adapter->intf;



	r_val = pintfhdl->io_ops._read16(pintfhdl, addr);
@@ -66,8 +64,7 @@ u16 _rtw_read1623a(struct rtw_adapter *adapter, u32 addr) 
u32 _rtw_read3223a(struct rtw_adapter *adapter, u32 addr)

{

	u32 r_val;

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &pio_priv->intf;

	struct intf_hdl *pintfhdl = &adapter->intf;



	r_val = pintfhdl->io_ops._read32(pintfhdl, addr);
@@ -76,8 +73,7 @@ u32 _rtw_read3223a(struct rtw_adapter *adapter, u32 addr) 


int _rtw_write823a(struct rtw_adapter *adapter, u32 addr, u8 val)

{

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl		*pintfhdl = &pio_priv->intf;

	struct intf_hdl *pintfhdl = &adapter->intf;

	int ret;



	ret = pintfhdl->io_ops._write8(pintfhdl, addr, val);
@@ -87,8 +83,7 @@ int _rtw_write823a(struct rtw_adapter *adapter, u32 addr, u8 val) 


int _rtw_write1623a(struct rtw_adapter *adapter, u32 addr, u16 val)

{

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl		*pintfhdl = &pio_priv->intf;

	struct intf_hdl *pintfhdl = &adapter->intf;

	int ret;



	val = cpu_to_le16(val);
@@ -96,10 +91,10 @@ int _rtw_write1623a(struct rtw_adapter *adapter, u32 addr, u16 val) 


	return RTW_STATUS_CODE23a(ret);

}



int _rtw_write3223a(struct rtw_adapter *adapter, u32 addr, u32 val)

{

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &pio_priv->intf;

	struct intf_hdl *pintfhdl = &adapter->intf;

	int ret;



	val = cpu_to_le32(val);
@@ -110,8 +105,7 @@ int _rtw_write3223a(struct rtw_adapter *adapter, u32 addr, u32 val) 


int _rtw_writeN23a(struct rtw_adapter *adapter, u32 addr , u32 length , u8 *pdata)

{

	struct io_priv *pio_priv = &adapter->iopriv;

        struct intf_hdl *pintfhdl = (struct intf_hdl*)&pio_priv->intf;

        struct intf_hdl *pintfhdl = &adapter->intf;

	int ret;



	ret = pintfhdl->io_ops._writeN(pintfhdl, addr, length, pdata);
@@ -120,8 +114,7 @@ int _rtw_writeN23a(struct rtw_adapter *adapter, u32 addr , u32 length , u8 *pdat 
}

void _rtw_read_mem23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)

{

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &pio_priv->intf;

	struct intf_hdl *pintfhdl = &adapter->intf;



	if ((adapter->bDriverStopped == true) ||

	    (adapter->bSurpriseRemoved == true)) {
@@ -137,8 +130,7 @@ void _rtw_read_mem23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) 


void _rtw_write_mem23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)

{

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &pio_priv->intf;

	struct intf_hdl *pintfhdl = &adapter->intf;



	pintfhdl->io_ops._write_mem(pintfhdl, addr, cnt, pmem);

}
@@ -146,8 +138,7 @@ void _rtw_write_mem23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) 
void _rtw_read_port23a(struct rtw_adapter *adapter, u32 addr, u32 cnt,

		    struct recv_buf *rbuf)

{

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &pio_priv->intf;

	struct intf_hdl *pintfhdl = &adapter->intf;



	if ((adapter->bDriverStopped == true) ||

	    (adapter->bSurpriseRemoved == true)) {
@@ -164,8 +155,7 @@ void _rtw_read_port23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, 
void _rtw_read_port23a_cancel(struct rtw_adapter *adapter)

{

	void (*_read_port_cancel)(struct intf_hdl *pintfhdl);

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &pio_priv->intf;

	struct intf_hdl *pintfhdl = &adapter->intf;



	_read_port_cancel = pintfhdl->io_ops._read_port_cancel;
@@ -176,8 +166,7 @@ void _rtw_read_port23a_cancel(struct rtw_adapter *adapter) 
u32 _rtw_write_port23a(struct rtw_adapter *adapter, u32 addr, u32 cnt,

		    struct xmit_buf *xbuf)

{

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &pio_priv->intf;

	struct intf_hdl *pintfhdl = &adapter->intf;

	u32 ret = _SUCCESS;



	ret = pintfhdl->io_ops._write_port(pintfhdl, addr, cnt, xbuf);
@@ -188,8 +177,7 @@ u32 _rtw_write_port23a(struct rtw_adapter *adapter, u32 addr, u32 cnt, 
void _rtw_write_port23a_cancel(struct rtw_adapter *adapter)

{

	void (*_write_port_cancel)(struct intf_hdl *pintfhdl);

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &pio_priv->intf;

	struct intf_hdl *pintfhdl = &adapter->intf;



	_write_port_cancel = pintfhdl->io_ops._write_port_cancel;

drivers/staging/rtl8723au/hal/usb_halinit.c

+1 −1
Original line number Diff line number Diff line
@@ -1227,7 +1227,7 @@ static unsigned int rtl8723au_inirp_init(struct rtw_adapter *Adapter) 
	u8 i;

	struct recv_buf *precvbuf;

	uint	status;

	struct intf_hdl *pintfhdl = &Adapter->iopriv.intf;

	struct intf_hdl *pintfhdl = &Adapter->intf;

	struct recv_priv *precvpriv = &Adapter->recvpriv;

	u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,

			  struct recv_buf *rbuf);

drivers/staging/rtl8723au/hal/usb_ops_linux.c

+1 −2
Original line number Diff line number Diff line
@@ -817,8 +817,7 @@ void rtl8723au_xmit_tasklet(void *priv) 


void rtl8723au_set_intf_ops(struct rtw_adapter *padapter)

{

	struct io_priv	*piopriv = &padapter->iopriv;

	struct intf_hdl *pintf = &piopriv->intf;

	struct intf_hdl *pintf = &padapter->intf;

	struct _io_ops *pops = &pintf->io_ops;



	pintf->padapter = padapter;

drivers/staging/rtl8723au/include/drv_types.h

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ struct rtw_adapter { 
	struct	mlme_ext_priv mlmeextpriv;

	struct	cmd_priv	cmdpriv;

	struct	evt_priv	evtpriv;

	struct	io_priv	iopriv;

	struct intf_hdl intf;

	struct	xmit_priv	xmitpriv;

	struct	recv_priv	recvpriv;

	struct	sta_priv	stapriv;

drivers/staging/rtl8723au/include/rtw_io.h

+0 −10
Original line number Diff line number Diff line
@@ -256,16 +256,6 @@ struct reg_protocol_wt { 
};







/*

Below is the data structure used by _io_handler



*/



struct io_priv{

	struct intf_hdl intf;

};



uint register_intf_hdl(u8 *dev, struct intf_hdl *pintfhdl);

void unregister_intf_hdl(struct intf_hdl *pintfhdl);

CRA Git | Maintained and supported by SUSTech CRA and CCSE