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

staging: r8188eu: remove the helpers of usb_write16() 



Remove the unnecessary _rtw_write16() and usb_write16() and embed their
code into the caller (i.e., rtw_write16()).

_rtw_write16() is a mere redefinition of rtw_write16() and it is unneeded.
usb_write16() was the only functions assigned to the (*_usb_write16)
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-7-fmdefrancesco@gmail.com


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

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_write16(struct adapter *adapter, u32 addr, u16 val)

{

	struct io_priv *pio_priv = &adapter->iopriv;

	struct	intf_hdl		*pintfhdl = &pio_priv->intf;

	int (*_write16)(struct intf_hdl *pintfhdl, u32 addr, u16 val);

	int ret;



	_write16 = pintfhdl->io_ops._write16;



	ret = _write16(pintfhdl, addr, val);





	return RTW_STATUS_CODE(ret);

}

int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)

{

	struct io_priv *pio_priv = &adapter->iopriv;

drivers/staging/r8188eu/hal/usb_ops_linux.c

+7 −3
Original line number Diff line number Diff line
@@ -145,12 +145,17 @@ int rtw_write8(struct adapter *adapter, u32 addr, u8 val) 
	return RTW_STATUS_CODE(ret);

}



static int usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val)

int rtw_write16(struct adapter *adapter, u32 addr, u16 val)

{

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &pio_priv->intf;

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

	__le32 data = cpu_to_le32(val & 0x0000ffff);

	int ret;



	return usbctrl_vendorreq(pintfhdl, wvalue, &data, 2, REALTEK_USB_VENQT_WRITE);

	ret = usbctrl_vendorreq(pintfhdl, wvalue, &data, 2, REALTEK_USB_VENQT_WRITE);



	return RTW_STATUS_CODE(ret);

}



static int usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val)
@@ -550,7 +555,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->_write16 = &usb_write16;

	pops->_write32 = &usb_write32;

	pops->_writeN = &usb_writeN;

	pops->_write_port = &usb_write_port;

drivers/staging/r8188eu/include/rtw_io.h

+1 −3
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ void _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);

int _rtw_write16(struct adapter *adapter, u32 addr, u16 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);
@@ -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_write16(adapter, addr, val)				\

	_rtw_write16((adapter), (addr), (val))

#define  rtw_write32(adapter, addr, val)				\

	_rtw_write32((adapter), (addr), (val))

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