Commit 9f5b245b authored by Pavel Skripkin's avatar Pavel Skripkin Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove the helpers of usb_write_port_cancel() 



Remove the unnecessary _rtw_write_port_cancel() and usb_write_port_cancel()
and embed their code into the caller (i.e., rtw_write_port_cancel()).

_rtw_write_port_cancel() is a mere redefinition of rtw_write_port_cancel()
and it is unneeded. usb_write_port_cancel() was the only functions
assigned to the (*_usb_write_port_cancel) pointer, so we can simply remove
it and make a direct call.

This patch is in preparation for the _io_ops structure removal.

Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Co-developed-by: default avatarFabio M. De Francesco <fmdefrancesco@gmail.com>
Signed-off-by: default avatarFabio M. De Francesco <fmdefrancesco@gmail.com>
Signed-off-by: default avatarPavel Skripkin <paskripkin@gmail.com>
Link: https://lore.kernel.org/r/20210917071837.10926-13-fmdefrancesco@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 54751497

drivers/staging/r8188eu/core/rtw_io.c

+0 −12
Original line number Diff line number Diff line
@@ -93,18 +93,6 @@ u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pme 
	return ret;

}



void _rtw_write_port_cancel(struct adapter *adapter)

{

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

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &pio_priv->intf;



	_write_port_cancel = pintfhdl->io_ops._write_port_cancel;



	if (_write_port_cancel)

		_write_port_cancel(pintfhdl);

}



int rtw_init_io_priv(struct adapter *padapter, void (*set_intf_ops)(struct _io_ops *pops))

{

	struct io_priv	*piopriv = &padapter->iopriv;

drivers/staging/r8188eu/hal/usb_ops_linux.c

+0 −2
Original line number Diff line number Diff line
@@ -562,8 +562,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) 
{



	memset((u8 *)pops, 0, sizeof(struct _io_ops));

	pops->_write_port_cancel = &usb_write_port_cancel;



}



void rtl8188eu_set_hw_type(struct adapter *adapt)

drivers/staging/r8188eu/include/rtw_io.h

+1 −2
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); 
u32 rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);

u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt,

			     u8 *pmem, int timeout_ms);

void _rtw_write_port_cancel(struct adapter *adapter);

void rtw_write_port_cancel(struct adapter *adapter);





#define rtw_write8_async(adapter, addr, val)				\
@@ -276,7 +276,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); 
	_rtw_write32_async((adapter), (addr), (val))

#define rtw_write_port_and_wait(adapter, addr, cnt, mem, timeout_ms)	\

	_rtw_write_port_and_wait((adapter), (addr), (cnt), (mem), (timeout_ms))

#define rtw_write_port_cancel(adapter) _rtw_write_port_cancel((adapter))



/* ioreq */

void ioreq_read8(struct adapter *adapter, u32 addr, u8 *pval);

drivers/staging/r8188eu/include/usb_ops_linux.h

+0 −2
Original line number Diff line number Diff line
@@ -28,6 +28,4 @@ 


unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr);



void usb_write_port_cancel(struct intf_hdl *pintfhdl);



#endif

drivers/staging/r8188eu/os_dep/usb_ops_linux.c

+1 −2
Original line number Diff line number Diff line
@@ -211,10 +211,9 @@ u32 rtw_write_port(struct adapter *padapter, u32 addr, u32 cnt, u8 *wmem) 
	return ret;

}



void usb_write_port_cancel(struct intf_hdl *pintfhdl)

void rtw_write_port_cancel(struct adapter *padapter)

{

	int i, j;

	struct adapter	*padapter = pintfhdl->padapter;

	struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf;



	DBG_88E("%s\n", __func__);