staging: rtl8723bs: remove duplicate names for _rtw_write8()

_rtw_write8() is redefined as rtw_write8() and PlatformEFIOWrite1Byte().
Because rtw_write8() is the only name used in the driver, remove the
duplicate definitions and rename the function from _rtw_write8() to
rtw_write8()

Signed-off-by: Bryan Brattlof <hello@bryanbrattlof.com>
Link: https://lore.kernel.org/r/35ffc9cd5af7009b317361033a6ca5263307d61a.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 9428860162c337fd517f8b9aeb87aab5e8af40af..6fafb84934e5aa9649bd8b1b3eaa713518c3cd69 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_io.c
+++ b/drivers/staging/rtl8723bs/core/rtw_io.c
@@ -74,7 +74,7 @@ u32 rtw_read32(struct adapter *adapter, u32 addr)
 
 }
 
-int _rtw_write8(struct adapter *adapter, u32 addr, u8 val)
+int rtw_write8(struct adapter *adapter, u32 addr, u8 val)
 {
        /* struct       io_queue        *pio_queue = (struct io_queue *)adapter->pio_queue; */
        struct io_priv *pio_priv = &adapter->iopriv;

diff --git a/drivers/staging/rtl8723bs/include/rtw_io.h b/drivers/staging/rtl8723bs/include/rtw_io.h
index fa0eed017e966b5e2a607a45061ced343c9a1b4b..dbcf227dbcbafb91a0471cc8ded3aeddefef1737 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_io.h
+++ b/drivers/staging/rtl8723bs/include/rtw_io.h
@@ -174,7 +174,7 @@ 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 int _rtw_write8(struct adapter *adapter, u32 addr, u8 val);
+extern int rtw_write8(struct adapter *adapter, u32 addr, u8 val);
 extern int _rtw_write16(struct adapter *adapter, u32 addr, u16 val);
 extern int _rtw_write32(struct adapter *adapter, u32 addr, u32 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_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))
 
@@ -232,8 +231,6 @@ extern void bus_sync_io(struct io_queue *pio_q);
 extern u32 _ioreq2rwmem(struct io_queue *pio_q);
 extern void dev_power_down(struct adapter *Adapter, u8 bpwrup);
 
-#define PlatformEFIOWrite1Byte(_a, _b, _c)             \
-       rtw_write8(_a, _b, _c)
 #define PlatformEFIOWrite2Byte(_a, _b, _c)             \
        rtw_write16(_a, _b, _c)
 #define PlatformEFIOWrite4Byte(_a, _b, _c)             \