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

staging: r8188eu: remove the helpers of rtw_read32() 



Remove the unnecessary _rtw_readr32() and usb_read32() and embed their
code into the caller (i.e., rtw_read32()).

_rtw_read32() is a mere redefinition of rtw_read32() and it is unneeded.
usb_read32() was the only functions assigned to the (*_usb_read32) 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-5-fmdefrancesco@gmail.com


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

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)



u32 _rtw_read32(struct adapter *adapter, u32 addr)

{

	u32 r_val;

	struct io_priv *pio_priv = &adapter->iopriv;

	struct	intf_hdl		*pintfhdl = &pio_priv->intf;

	u32	(*_read32)(struct intf_hdl *pintfhdl, u32 addr);



	_read32 = pintfhdl->io_ops._read32;



	r_val = _read32(pintfhdl, addr);



	return r_val;

}



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

{

	struct io_priv *pio_priv = &adapter->iopriv;

drivers/staging/r8188eu/hal/usb_ops_linux.c

+3 −2
Original line number Diff line number Diff line
@@ -121,8 +121,10 @@ u16 rtw_read16(struct adapter *adapter, u32 addr) 
	return (u16)(le32_to_cpu(data) & 0xffff);

}



static u32 usb_read32(struct intf_hdl *pintfhdl, u32 addr)

u32 rtw_read32(struct adapter *adapter, u32 addr)

{

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &pio_priv->intf;

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

	__le32 data;
@@ -542,7 +544,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) 
{



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

	pops->_read32 = &usb_read32;

	pops->_read_port = &usb_read_port;

	pops->_write8 = &usb_write8;

	pops->_write16 = &usb_write16;

drivers/staging/r8188eu/include/rtw_io.h

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


u8 rtw_read8(struct adapter *adapter, u32 addr);

u16 rtw_read16(struct adapter *adapter, u32 addr);

u32 _rtw_read32(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);

void _rtw_read_port_cancel(struct adapter *adapter);
@@ -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_read32(adapter, addr) _rtw_read32((adapter), (addr))

#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))