[PATCH 2/8] staging: rtl8723bs: remove duplicate names for _rtw_read16()

From: Bryan Brattlof
Date: Tue May 18 2021 - 14:29:10 EST

_rtw_read16() is redefined as rtw_read16() and PlatformEFIORead2Byte().
Because rtw_read16() is the only name used in the driver, remove the
duplicate definitions and rename the function from _rtw_read16() to

Signed-off-by: Bryan Brattlof <hello@xxxxxxxxxxxxxxxxx>
drivers/staging/rtl8723bs/core/rtw_io.c | 2 +-
drivers/staging/rtl8723bs/include/rtw_io.h | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_io.c b/drivers/staging/rtl8723bs/core/rtw_io.c
index 99bb53aee59c..e06901cd8ce6 100644
--- a/drivers/staging/rtl8723bs/core/rtw_io.c
+++ b/drivers/staging/rtl8723bs/core/rtw_io.c
@@ -45,7 +45,7 @@ u8 rtw_read8(struct adapter *adapter, u32 addr)
return _read8(pintfhdl, addr);

-u16 _rtw_read16(struct adapter *adapter, u32 addr)
+u16 rtw_read16(struct adapter *adapter, u32 addr)
u16 r_val;
/* struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; */
diff --git a/drivers/staging/rtl8723bs/include/rtw_io.h b/drivers/staging/rtl8723bs/include/rtw_io.h
index f7b441e1eae1..e89b677c5e13 100644
--- a/drivers/staging/rtl8723bs/include/rtw_io.h
+++ b/drivers/staging/rtl8723bs/include/rtw_io.h
@@ -171,7 +171,7 @@ extern void _rtw_attrib_read(struct adapter *adapter, u32 addr, u32 cnt, u8 *pme
extern void _rtw_attrib_write(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);

extern u8 rtw_read8(struct adapter *adapter, u32 addr);
-extern u16 _rtw_read16(struct adapter *adapter, u32 addr);
+extern u16 rtw_read16(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);
@@ -182,7 +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_read16(adapter, addr) _rtw_read16((adapter), (addr))
#define rtw_read32(adapter, addr) _rtw_read32((adapter), (addr))

#define rtw_write8(adapter, addr, val) _rtw_write8((adapter), (addr), (val))
@@ -242,8 +241,6 @@ extern void dev_power_down(struct adapter *Adapter, u8 bpwrup);
#define PlatformEFIOWrite4Byte(_a, _b, _c) \
rtw_write32(_a, _b, _c)

-#define PlatformEFIORead2Byte(_a, _b) \
- rtw_read16(_a, _b)
#define PlatformEFIORead4Byte(_a, _b) \
rtw_read32(_a, _b)

git-series 0.9.1