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

staging: r8188eu: remove the helpers of usb_read_port() 



Remove the unnecessary _rtw_read_port() and usb_read_port() and embed their
code into the caller (i.e., rtw_read_port()).

_rtw_read_port() is a mere redefinition of rtw_read_port() and it is
unneeded. usb_read_port() was the only functions assigned to the
(*_usb_read_port) 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-10-fmdefrancesco@gmail.com


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

drivers/staging/r8188eu/core/rtw_io.c

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

}



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

{

	u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);

	struct io_priv *pio_priv = &adapter->iopriv;

	struct	intf_hdl		*pintfhdl = &pio_priv->intf;







	if (adapter->bDriverStopped || adapter->bSurpriseRemoved)

	     return;



	_read_port = pintfhdl->io_ops._read_port;



	_read_port(pintfhdl, addr, cnt, pmem);





}



void _rtw_read_port_cancel(struct adapter *adapter)

{

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

drivers/staging/r8188eu/hal/usb_halinit.c

+1 −5
Original line number Diff line number Diff line
@@ -1033,11 +1033,7 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter) 
	u8 i;

	struct recv_buf *precvbuf;

	uint	status;

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

	struct recv_priv *precvpriv = &Adapter->recvpriv;

	u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);



	_read_port = pintfhdl->io_ops._read_port;



	status = _SUCCESS;
@@ -1046,7 +1042,7 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter) 
	/* issue Rx irp to receive data */

	precvbuf = (struct recv_buf *)precvpriv->precv_buf;

	for (i = 0; i < NR_RECVBUFF; i++) {

		if (!_read_port(pintfhdl, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf)) {

		if (!rtw_read_port(Adapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf)) {

			status = _FAIL;

			goto exit;

		}

drivers/staging/r8188eu/hal/usb_ops_linux.c

+1 −3
Original line number Diff line number Diff line
@@ -456,11 +456,10 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) 
	}

}



static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)

u32 rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *rmem)

{

	struct urb *purb = NULL;

	struct recv_buf	*precvbuf = (struct recv_buf *)rmem;

	struct adapter		*adapter = pintfhdl->padapter;

	struct dvobj_priv	*pdvobj = adapter_to_dvobj(adapter);

	struct recv_priv	*precvpriv = &adapter->recvpriv;

	struct usb_device	*pusbd = pdvobj->pusbdev;
@@ -563,7 +562,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) 
{



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

	pops->_read_port = &usb_read_port;

	pops->_write_port = &usb_write_port;

	pops->_read_port_cancel = &usb_read_port_cancel;

	pops->_write_port_cancel = &usb_write_port_cancel;

drivers/staging/r8188eu/include/rtw_io.h

+1 −3
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ u8 rtw_read8(struct adapter *adapter, u32 addr); 
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);

void _rtw_read_port(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);



int rtw_write8(struct adapter *adapter, u32 addr, u8 val);
@@ -267,8 +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(adapter, addr, cnt, mem)				\

	_rtw_read_port((adapter), (addr), (cnt), (mem))

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



#define rtw_write8_async(adapter, addr, val)				\