Commit 16b1b3c8 authored by Bryan Brattlof's avatar Bryan Brattlof Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove duplicate names for _rtw_read32() 



_rtw_read32() is redefined as rtw_read32() and PlatformEFIORead4Byte().
Because rtw_read32() is the only name used in the driver, remove the
duplicate definitions and rename the function from _rtw_read32() to
rtw_read32()

Signed-off-by: default avatarBryan Brattlof <hello@bryanbrattlof.com>
Link: https://lore.kernel.org/r/15956707341f76de683245c392063b8121a805ea.1621361919.git-series.hello@bryanbrattlof.com


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

drivers/staging/rtl8723bs/core/rtw_io.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ u16 rtw_read16(struct adapter *adapter, u32 addr) 
	return rtw_le16_to_cpu(r_val);

}



u32 _rtw_read32(struct adapter *adapter, u32 addr)

u32 rtw_read32(struct adapter *adapter, u32 addr)

{

	u32 r_val;

	/* struct	io_queue	*pio_queue = (struct io_queue *)adapter->pio_queue; */

drivers/staging/rtl8723bs/include/rtw_io.h

+1 −6
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ extern void _rtw_attrib_write(struct adapter *adapter, u32 addr, u32 cnt, u8 *pm 


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

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

extern u32 _rtw_read32(struct adapter *adapter, u32 addr);

extern u32 rtw_read32(struct adapter *adapter, u32 addr);



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

extern int _rtw_write16(struct adapter *adapter, u32 addr, u16 val);
@@ -182,8 +182,6 @@ extern u8 _rtw_sd_f0_read8(struct adapter *adapter, u32 addr); 


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



#define rtw_read32(adapter, addr) _rtw_read32((adapter), (addr))



#define  rtw_write8(adapter, addr, val) _rtw_write8((adapter), (addr), (val))

#define  rtw_write16(adapter, addr, val) _rtw_write16((adapter), (addr), (val))

#define  rtw_write32(adapter, addr, val) _rtw_write32((adapter), (addr), (val))
@@ -241,7 +239,4 @@ extern void dev_power_down(struct adapter *Adapter, u8 bpwrup); 
#define PlatformEFIOWrite4Byte(_a, _b, _c)		\

	rtw_write32(_a, _b, _c)



#define PlatformEFIORead4Byte(_a, _b)		\

		rtw_read32(_a, _b)



#endif	/* _RTL8711_IO_H_ */