Commit 1c42d72e authored by Bryan Brattlof's avatar Bryan Brattlof Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove duplicate names for _rtw_write16() 



_rtw_write16() is redefined as rtw_write16() and
PlatformEFIOWrite2Byte(). Because rtw_write16() is the only name used in
the driver, remove the duplicate definitions and rename the function
from _rtw_write16() to rtw_write16()

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


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

drivers/staging/rtl8723bs/core/rtw_io.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ int rtw_write8(struct adapter *adapter, u32 addr, u8 val) 


	return RTW_STATUS_CODE(ret);

}

int _rtw_write16(struct adapter *adapter, u32 addr, u16 val)

int rtw_write16(struct adapter *adapter, u32 addr, u16 val)

{

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

	struct io_priv *pio_priv = &adapter->iopriv;

drivers/staging/rtl8723bs/include/rtw_io.h

+1 −4
Original line number Diff line number Diff line
@@ -175,14 +175,13 @@ 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_write16(struct adapter *adapter, u32 addr, u16 val);

extern int rtw_write16(struct adapter *adapter, u32 addr, u16 val);

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_write16(adapter, addr, val) _rtw_write16((adapter), (addr), (val))

#define  rtw_write32(adapter, addr, val) _rtw_write32((adapter), (addr), (val))



#define rtw_write_port(adapter, addr, cnt, mem) _rtw_write_port((adapter), (addr), (cnt), (mem))
@@ -231,8 +230,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 PlatformEFIOWrite2Byte(_a, _b, _c)		\

	rtw_write16(_a, _b, _c)

#define PlatformEFIOWrite4Byte(_a, _b, _c)		\

	rtw_write32(_a, _b, _c)