diff options
| author |   Bryan Brattlof <hello@bryanbrattlof.com> | 2021-05-18 18:27:43 +0000 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-19 17:58:35 +0200 |
| commit | 51d4aa6d6bf35d85d318831df60a34bad27cdb9e (patch) | |
| tree | 5ebcd33d9fa55089c84f1ed4d60d5649c12be21a /drivers/staging/rtl8723bs | |
| parent | staging: vchiq_core: introduce defines for retry_poll (diff) | |
| download | linux-dev-51d4aa6d6bf35d85d318831df60a34bad27cdb9e.tar.xz linux-dev-51d4aa6d6bf35d85d318831df60a34bad27cdb9e.zip | |
staging: rtl8723bs: remove duplicate names for _rtw_read8()
_rtw_read8() is redefined as rtw_read8() and PlatformEFIORead1Byte().
Because rtw_read8() is the only name used in the driver, remove the
duplicate definitions and rename the function from _rtw_read8() to
rtw_read8()
Signed-off-by: Bryan Brattlof <hello@bryanbrattlof.com>
Link: https://lore.kernel.org/r/9880c86c2aad7d95a714d8b03b28b83634f98c1e.1621361919.git-series.hello@bryanbrattlof.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8723bs')
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_io.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/include/rtw_io.h | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/rtl8723bs/core/rtw_io.c b/drivers/staging/rtl8723bs/core/rtw_io.c index ecbb679fbc16..99bb53aee59c 100644 --- a/drivers/staging/rtl8723bs/core/rtw_io.c +++ b/drivers/staging/rtl8723bs/core/rtw_io.c @@ -33,7 +33,7 @@ jackson@realtek.com.tw #define rtw_cpu_to_le16(val) val #define rtw_cpu_to_le32(val) val -u8 _rtw_read8(struct adapter *adapter, u32 addr) +u8 rtw_read8(struct adapter *adapter, u32 addr) { /* 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 fbb73e698e09..f7b441e1eae1 100644 --- a/drivers/staging/rtl8723bs/include/rtw_io.h +++ b/drivers/staging/rtl8723bs/include/rtw_io.h @@ -170,7 +170,7 @@ extern void unregister_intf_hdl(struct intf_hdl *pintfhdl); extern void _rtw_attrib_read(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); extern void _rtw_attrib_write(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -extern u8 _rtw_read8(struct adapter *adapter, u32 addr); +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); @@ -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_read8(adapter, addr) _rtw_read8((adapter), (addr)) #define rtw_read16(adapter, addr) _rtw_read16((adapter), (addr)) #define rtw_read32(adapter, addr) _rtw_read32((adapter), (addr)) @@ -243,8 +242,6 @@ extern void dev_power_down(struct adapter *Adapter, u8 bpwrup); #define PlatformEFIOWrite4Byte(_a, _b, _c) \ rtw_write32(_a, _b, _c) -#define PlatformEFIORead1Byte(_a, _b) \ - rtw_read8(_a, _b) #define PlatformEFIORead2Byte(_a, _b) \ rtw_read16(_a, _b) #define PlatformEFIORead4Byte(_a, _b) \ |