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

staging: r8188eu: remove the helpers of usb_read_port_cancel() 



Remove the unnecessary _rtw_read_port_cancel() and usb_read_port_cancel()
and embed their code into the caller (i.e., rtw_read_port_cancel()).

_rtw_read_port_cancel() is a mere redefinition of rtw_read_port_cancel()
and it is unneeded. usb_read_port_cancel() was the only functions assigned
to the (*_usb_read_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-12-fmdefrancesco@gmail.com


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

drivers/staging/r8188eu/core/rtw_io.c

+0 −11
Original line number Diff line number Diff line
@@ -75,17 +75,6 @@ int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val) 
	return RTW_STATUS_CODE(ret);

}



void _rtw_read_port_cancel(struct adapter *adapter)

{

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

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &pio_priv->intf;



	_read_port_cancel = pintfhdl->io_ops._read_port_cancel;



	if (_read_port_cancel)

		_read_port_cancel(pintfhdl);

}



u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms)

{

drivers/staging/r8188eu/hal/usb_ops_linux.c

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



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

	pops->_read_port_cancel = &usb_read_port_cancel;

	pops->_write_port_cancel = &usb_write_port_cancel;



}

drivers/staging/r8188eu/include/rtw_io.h

+1 −2
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ u16 rtw_read16(struct adapter *adapter, u32 addr); 
u32 rtw_read32(struct adapter *adapter, u32 addr);

void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);

u32 rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);

void _rtw_read_port_cancel(struct adapter *adapter);

void rtw_read_port_cancel(struct adapter *adapter);



int rtw_write8(struct adapter *adapter, u32 addr, u8 val);

int rtw_write16(struct adapter *adapter, u32 addr, u16 val);
@@ -267,7 +267,6 @@ 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);



#define rtw_read_port_cancel(adapter) _rtw_read_port_cancel((adapter))



#define rtw_write8_async(adapter, addr, val)				\

	_rtw_write8_async((adapter), (addr), (val))

drivers/staging/r8188eu/include/usb_ops_linux.h

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


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



void usb_read_port_cancel(struct intf_hdl *pintfhdl);



void usb_write_port_cancel(struct intf_hdl *pintfhdl);



#endif

drivers/staging/r8188eu/os_dep/usb_ops_linux.c

+2 −4
Original line number Diff line number Diff line
@@ -31,12 +31,10 @@ struct zero_bulkout_context { 
	void *padapter;

};



void usb_read_port_cancel(struct intf_hdl *pintfhdl)

void rtw_read_port_cancel(struct adapter *padapter)

{

	int i;

	struct recv_buf *precvbuf;

	struct adapter	*padapter = pintfhdl->padapter;

	precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf;

	struct recv_buf *precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf;



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