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

staging: r8188eu: remove the helpers of usb_writeN() 



Remove the unnecessary _rtw_writeN() and usb_writeN() and embed their
code into the caller (i.e., rtw_writeN()).

_rtw_writeN() is a mere redefinition of rtw_writeN() and it is unneeded.
usb_writeN() was the only functions assigned to the (*_usb_writeN) 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-9-fmdefrancesco@gmail.com


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

drivers/staging/r8188eu/core/rtw_io.c

+0 −14
Original line number Diff line number Diff line
@@ -34,20 +34,6 @@ jackson@realtek.com.tw 
#define rtw_cpu_to_le16(val)		cpu_to_le16(val)

#define rtw_cpu_to_le32(val)		cpu_to_le32(val)



int _rtw_writeN(struct 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);

	int (*_writeN)(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata);

	int ret;



	_writeN = pintfhdl->io_ops._writeN;



	ret = _writeN(pintfhdl, addr, length, pdata);





	return RTW_STATUS_CODE(ret);

}

int _rtw_write8_async(struct adapter *adapter, u32 addr, u8 val)

{

	struct io_priv *pio_priv = &adapter->iopriv;

drivers/staging/r8188eu/hal/usb_ops_linux.c

+7 −4
Original line number Diff line number Diff line
@@ -171,17 +171,21 @@ int rtw_write32(struct adapter *adapter, u32 addr, u32 val) 
	return RTW_STATUS_CODE(ret);

}



static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata)

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

{

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &pio_priv->intf;

	u16 wvalue = (u16)(addr & 0x0000ffff);

	u8 buf[VENDOR_CMD_MAX_DATA_LEN] = {0};

	int ret;



	if (length > VENDOR_CMD_MAX_DATA_LEN)

		return -EINVAL;

		return _FAIL;



	memcpy(buf, pdata, length);

	ret = usbctrl_vendorreq(pintfhdl, wvalue, buf, (length & 0xffff), REALTEK_USB_VENQT_WRITE);



	return usbctrl_vendorreq(pintfhdl, wvalue, buf, (length & 0xffff), REALTEK_USB_VENQT_WRITE);

	return RTW_STATUS_CODE(ret);

}



static void interrupt_handler_8188eu(struct adapter *adapt, u16 pkt_len, u8 *pbuf)
@@ -560,7 +564,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->_writeN = &usb_writeN;

	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
@@ -255,7 +255,7 @@ 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);

int rtw_write32(struct adapter *adapter, u32 addr, u32 val);

int _rtw_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *pdata);

int rtw_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *pdata);



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

int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val);
@@ -271,8 +271,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); 
	_rtw_read_port((adapter), (addr), (cnt), (mem))

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



#define  rtw_writeN(adapter, addr, length, data)			\

	_rtw_writeN((adapter), (addr), (length), (data))

#define rtw_write8_async(adapter, addr, val)				\

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

#define rtw_write16_async(adapter, addr, val)				\