From: Bryan Brattlof Date: Tue, 18 May 2021 18:29:47 +0000 (+0000) Subject: staging: rtl8723bs: remove duplicate name for _rtw_write_port() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3bdc1bc67ed392601d5645c99c37a06410e03768;p=linux.git staging: rtl8723bs: remove duplicate name for _rtw_write_port() _rtw_write_port() is being redefined as rtw_write_port(). Because rtw_write_port() is the only name used in the driver, remove the duplicate definition and rename the function from _rtw_write_port() to rtw_write_port() Signed-off-by: Bryan Brattlof Link: https://lore.kernel.org/r/5b8543127a774ca65595588711c05cce28b17bf6.1621361919.git-series.hello@bryanbrattlof.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723bs/core/rtw_io.c b/drivers/staging/rtl8723bs/core/rtw_io.c index 4f66b961ef618..6de549e90999a 100644 --- a/drivers/staging/rtl8723bs/core/rtw_io.c +++ b/drivers/staging/rtl8723bs/core/rtw_io.c @@ -135,7 +135,7 @@ u8 _rtw_sd_f0_read8(struct adapter *adapter, u32 addr) return r_val; } -u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) +u32 rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) { u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); 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 3ba413ed30987..48e1352ac48ab 100644 --- a/drivers/staging/rtl8723bs/include/rtw_io.h +++ b/drivers/staging/rtl8723bs/include/rtw_io.h @@ -180,9 +180,7 @@ extern int rtw_write32(struct adapter *adapter, u32 addr, u32 val); 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_write_port(adapter, addr, cnt, mem) _rtw_write_port((adapter), (addr), (cnt), (mem)) +extern u32 rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); #define rtw_sd_f0_read8(adapter, addr) _rtw_sd_f0_read8((adapter), (addr))