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: Bryan Brattlof <hello@bryanbrattlof.com>
Link: https://lore.kernel.org/r/15956707341f76de683245c392063b8121a805ea.1621361919.git-series.hello@bryanbrattlof.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_io.c b/drivers/staging/rtl8723bs/core/rtw_io.c
index e06901cd8ce68597ea8ca087ae7fae2ffd8dcbd0..9428860162c337fd517f8b9aeb87aab5e8af40af 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_io.c
+++ b/drivers/staging/rtl8723bs/core/rtw_io.c
@@ -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; */

diff --git a/drivers/staging/rtl8723bs/include/rtw_io.h b/drivers/staging/rtl8723bs/include/rtw_io.h
index e89b677c5e138f995f517808244b9a6c6b1762e3..fa0eed017e966b5e2a607a45061ced343c9a1b4b 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_io.h
+++ b/drivers/staging/rtl8723bs/include/rtw_io.h
@@ -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_ */