diff options
| author |   Bryan Brattlof <hello@bryanbrattlof.com> | 2021-05-18 18:28:03 +0000 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-19 17:58:35 +0200 |
| commit | 16b1b3c8221a40bf899dfeebdb3d5245ecb65515 (patch) | |
| tree | 05ef987b8ee84534fd0ce0e1f042f80c95a02fde | |
| parent | staging: rtl8723bs: remove duplicate names for _rtw_read16() (diff) | |
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>
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_io.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/include/rtw_io.h | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/rtl8723bs/core/rtw_io.c b/drivers/staging/rtl8723bs/core/rtw_io.c index e06901cd8ce6..9428860162c3 100644 --- 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 e89b677c5e13..fa0eed017e96 100644 --- 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_ */ |