* [PATCH 1/8] staging: rtl8723bs: remove duplicate names for _rtw_read8()
[not found] <cover.7975aa58aadc20eae4102c8c0fe0e0d0ecb0a9fa.1621361919.git-series.hello@bryanbrattlof.com>
@ 2021-05-18 18:27 ` Bryan Brattlof
2021-05-18 18:27 ` [PATCH 4/8] staging: rtl8723bs: remove duplicate names for _rtw_write8() Bryan Brattlof
` (6 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: Bryan Brattlof @ 2021-05-18 18:27 UTC (permalink / raw)
To: Hans de Goede, Larry Finger, Greg Kroah-Hartman
Cc: Bryan Brattlof, linux-staging, linux-kernel
_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>
---
drivers/staging/rtl8723bs/core/rtw_io.c | 2 +-
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) \
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/8] staging: rtl8723bs: remove duplicate names for _rtw_write8()
[not found] <cover.7975aa58aadc20eae4102c8c0fe0e0d0ecb0a9fa.1621361919.git-series.hello@bryanbrattlof.com>
2021-05-18 18:27 ` [PATCH 1/8] staging: rtl8723bs: remove duplicate names for _rtw_read8() Bryan Brattlof
@ 2021-05-18 18:27 ` Bryan Brattlof
2021-05-18 18:28 ` [PATCH 3/8] staging: rtl8723bs: remove duplicate names for _rtw_read32() Bryan Brattlof
` (5 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: Bryan Brattlof @ 2021-05-18 18:27 UTC (permalink / raw)
To: Hans de Goede, Larry Finger, Greg Kroah-Hartman
Cc: Bryan Brattlof, linux-staging, linux-kernel
_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>
---
drivers/staging/rtl8723bs/core/rtw_io.c | 2 +-
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 9428860162c3..6fafb84934e5 100644
--- 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 fa0eed017e96..dbcf227dbcba 100644
--- 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) \
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/8] staging: rtl8723bs: remove duplicate names for _rtw_read32()
[not found] <cover.7975aa58aadc20eae4102c8c0fe0e0d0ecb0a9fa.1621361919.git-series.hello@bryanbrattlof.com>
2021-05-18 18:27 ` [PATCH 1/8] staging: rtl8723bs: remove duplicate names for _rtw_read8() Bryan Brattlof
2021-05-18 18:27 ` [PATCH 4/8] staging: rtl8723bs: remove duplicate names for _rtw_write8() Bryan Brattlof
@ 2021-05-18 18:28 ` Bryan Brattlof
2021-05-18 18:28 ` [PATCH 5/8] staging: rtl8723bs: remove duplicate names for _rtw_write16() Bryan Brattlof
` (4 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: Bryan Brattlof @ 2021-05-18 18:28 UTC (permalink / raw)
To: Hans de Goede, Larry Finger, Greg Kroah-Hartman
Cc: Bryan Brattlof, linux-staging, linux-kernel
_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>
---
drivers/staging/rtl8723bs/core/rtw_io.c | 2 +-
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_ */
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 5/8] staging: rtl8723bs: remove duplicate names for _rtw_write16()
[not found] <cover.7975aa58aadc20eae4102c8c0fe0e0d0ecb0a9fa.1621361919.git-series.hello@bryanbrattlof.com>
` (2 preceding siblings ...)
2021-05-18 18:28 ` [PATCH 3/8] staging: rtl8723bs: remove duplicate names for _rtw_read32() Bryan Brattlof
@ 2021-05-18 18:28 ` Bryan Brattlof
2021-05-18 18:28 ` [PATCH 2/8] staging: rtl8723bs: remove duplicate names for _rtw_read16() Bryan Brattlof
` (3 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: Bryan Brattlof @ 2021-05-18 18:28 UTC (permalink / raw)
To: Hans de Goede, Larry Finger, Greg Kroah-Hartman
Cc: Bryan Brattlof, linux-staging, linux-kernel
_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: Bryan Brattlof <hello@bryanbrattlof.com>
---
drivers/staging/rtl8723bs/core/rtw_io.c | 2 +-
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 6fafb84934e5..cdd42e992d6e 100644
--- a/drivers/staging/rtl8723bs/core/rtw_io.c
+++ b/drivers/staging/rtl8723bs/core/rtw_io.c
@@ -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;
diff --git a/drivers/staging/rtl8723bs/include/rtw_io.h b/drivers/staging/rtl8723bs/include/rtw_io.h
index dbcf227dbcba..88518293839e 100644
--- a/drivers/staging/rtl8723bs/include/rtw_io.h
+++ b/drivers/staging/rtl8723bs/include/rtw_io.h
@@ -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)
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/8] staging: rtl8723bs: remove duplicate names for _rtw_read16()
[not found] <cover.7975aa58aadc20eae4102c8c0fe0e0d0ecb0a9fa.1621361919.git-series.hello@bryanbrattlof.com>
` (3 preceding siblings ...)
2021-05-18 18:28 ` [PATCH 5/8] staging: rtl8723bs: remove duplicate names for _rtw_write16() Bryan Brattlof
@ 2021-05-18 18:28 ` Bryan Brattlof
2021-05-18 18:29 ` [PATCH 7/8] staging: rtl8723bs: remove duplicate name for _rtw_write_port() Bryan Brattlof
` (2 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: Bryan Brattlof @ 2021-05-18 18:28 UTC (permalink / raw)
To: Hans de Goede, Larry Finger, Greg Kroah-Hartman
Cc: Bryan Brattlof, linux-staging, linux-kernel
_rtw_read16() is redefined as rtw_read16() and PlatformEFIORead2Byte().
Because rtw_read16() is the only name used in the driver, remove the
duplicate definitions and rename the function from _rtw_read16() to
rtw_read16()
Signed-off-by: Bryan Brattlof <hello@bryanbrattlof.com>
---
drivers/staging/rtl8723bs/core/rtw_io.c | 2 +-
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 99bb53aee59c..e06901cd8ce6 100644
--- a/drivers/staging/rtl8723bs/core/rtw_io.c
+++ b/drivers/staging/rtl8723bs/core/rtw_io.c
@@ -45,7 +45,7 @@ u8 rtw_read8(struct adapter *adapter, u32 addr)
return _read8(pintfhdl, addr);
}
-u16 _rtw_read16(struct adapter *adapter, u32 addr)
+u16 rtw_read16(struct adapter *adapter, u32 addr)
{
u16 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 f7b441e1eae1..e89b677c5e13 100644
--- a/drivers/staging/rtl8723bs/include/rtw_io.h
+++ b/drivers/staging/rtl8723bs/include/rtw_io.h
@@ -171,7 +171,7 @@ extern void _rtw_attrib_read(struct adapter *adapter, u32 addr, u32 cnt, u8 *pme
extern void _rtw_attrib_write(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);
extern u8 rtw_read8(struct adapter *adapter, u32 addr);
-extern u16 _rtw_read16(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);
@@ -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_read16(adapter, addr) _rtw_read16((adapter), (addr))
#define rtw_read32(adapter, addr) _rtw_read32((adapter), (addr))
#define rtw_write8(adapter, addr, val) _rtw_write8((adapter), (addr), (val))
@@ -242,8 +241,6 @@ extern void dev_power_down(struct adapter *Adapter, u8 bpwrup);
#define PlatformEFIOWrite4Byte(_a, _b, _c) \
rtw_write32(_a, _b, _c)
-#define PlatformEFIORead2Byte(_a, _b) \
- rtw_read16(_a, _b)
#define PlatformEFIORead4Byte(_a, _b) \
rtw_read32(_a, _b)
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 7/8] staging: rtl8723bs: remove duplicate name for _rtw_write_port()
[not found] <cover.7975aa58aadc20eae4102c8c0fe0e0d0ecb0a9fa.1621361919.git-series.hello@bryanbrattlof.com>
` (4 preceding siblings ...)
2021-05-18 18:28 ` [PATCH 2/8] staging: rtl8723bs: remove duplicate names for _rtw_read16() Bryan Brattlof
@ 2021-05-18 18:29 ` Bryan Brattlof
2021-05-18 18:30 ` [PATCH 8/8] staging: rtl8723bs: remove _rtw_sd_f0_read8() Bryan Brattlof
2021-05-18 18:31 ` [PATCH 6/8] staging: rtl8723bs: remove duplicate names for _rtw_write32() Bryan Brattlof
7 siblings, 0 replies; 8+ messages in thread
From: Bryan Brattlof @ 2021-05-18 18:29 UTC (permalink / raw)
To: Hans de Goede, Larry Finger, Greg Kroah-Hartman
Cc: Bryan Brattlof, linux-staging, linux-kernel
_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 <hello@bryanbrattlof.com>
---
drivers/staging/rtl8723bs/core/rtw_io.c | 2 +-
drivers/staging/rtl8723bs/include/rtw_io.h | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_io.c b/drivers/staging/rtl8723bs/core/rtw_io.c
index 4f66b961ef61..6de549e90999 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 3ba413ed3098..48e1352ac48a 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))
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 8/8] staging: rtl8723bs: remove _rtw_sd_f0_read8()
[not found] <cover.7975aa58aadc20eae4102c8c0fe0e0d0ecb0a9fa.1621361919.git-series.hello@bryanbrattlof.com>
` (5 preceding siblings ...)
2021-05-18 18:29 ` [PATCH 7/8] staging: rtl8723bs: remove duplicate name for _rtw_write_port() Bryan Brattlof
@ 2021-05-18 18:30 ` Bryan Brattlof
2021-05-18 18:31 ` [PATCH 6/8] staging: rtl8723bs: remove duplicate names for _rtw_write32() Bryan Brattlof
7 siblings, 0 replies; 8+ messages in thread
From: Bryan Brattlof @ 2021-05-18 18:30 UTC (permalink / raw)
To: Hans de Goede, Larry Finger, Greg Kroah-Hartman
Cc: Bryan Brattlof, linux-staging, linux-kernel
Both the _rtw_sd_f0_read8() function and the rtw_sd_f0_read8()
redefinition are used anywhere in the driver and can be removed.
Signed-off-by: Bryan Brattlof <hello@bryanbrattlof.com>
---
drivers/staging/rtl8723bs/core/rtw_io.c | 19 -------------------
drivers/staging/rtl8723bs/include/rtw_io.h | 4 ----
2 files changed, 23 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_io.c b/drivers/staging/rtl8723bs/core/rtw_io.c
index 6de549e90999..856e23398c03 100644
--- a/drivers/staging/rtl8723bs/core/rtw_io.c
+++ b/drivers/staging/rtl8723bs/core/rtw_io.c
@@ -116,25 +116,6 @@ int rtw_write32(struct adapter *adapter, u32 addr, u32 val)
return RTW_STATUS_CODE(ret);
}
-u8 _rtw_sd_f0_read8(struct adapter *adapter, u32 addr)
-{
- u8 r_val = 0x00;
- struct io_priv *pio_priv = &adapter->iopriv;
- struct intf_hdl *pintfhdl = &(pio_priv->intf);
- u8 (*_sd_f0_read8)(struct intf_hdl *pintfhdl, u32 addr);
-
- _sd_f0_read8 = pintfhdl->io_ops._sd_f0_read8;
-
- if (_sd_f0_read8)
- r_val = _sd_f0_read8(pintfhdl, addr);
- else
- netdev_warn(adapter->pnetdev,
- FUNC_ADPT_FMT " _sd_f0_read8 callback is NULL\n",
- FUNC_ADPT_ARG(adapter));
-
- return r_val;
-}
-
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);
diff --git a/drivers/staging/rtl8723bs/include/rtw_io.h b/drivers/staging/rtl8723bs/include/rtw_io.h
index 48e1352ac48a..ab3c5ffe011b 100644
--- a/drivers/staging/rtl8723bs/include/rtw_io.h
+++ b/drivers/staging/rtl8723bs/include/rtw_io.h
@@ -178,12 +178,8 @@ 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);
-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_sd_f0_read8(adapter, addr) _rtw_sd_f0_read8((adapter), (addr))
-
extern void rtw_write_scsi(struct adapter *adapter, u32 cnt, u8 *pmem);
/* ioreq */
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 6/8] staging: rtl8723bs: remove duplicate names for _rtw_write32()
[not found] <cover.7975aa58aadc20eae4102c8c0fe0e0d0ecb0a9fa.1621361919.git-series.hello@bryanbrattlof.com>
` (6 preceding siblings ...)
2021-05-18 18:30 ` [PATCH 8/8] staging: rtl8723bs: remove _rtw_sd_f0_read8() Bryan Brattlof
@ 2021-05-18 18:31 ` Bryan Brattlof
7 siblings, 0 replies; 8+ messages in thread
From: Bryan Brattlof @ 2021-05-18 18:31 UTC (permalink / raw)
To: Hans de Goede, Larry Finger, Greg Kroah-Hartman
Cc: Bryan Brattlof, linux-staging, linux-kernel
_rtw_write32() is redefined as rtw_write32() and
PlatformEFIOWrite4Byte(). Because rtw_write32() is the only name used in
the driver, remove the duplicate definitions and rename the function
from _rtw_write32() to rtw_write32()
Signed-off-by: Bryan Brattlof <hello@bryanbrattlof.com>
---
drivers/staging/rtl8723bs/core/rtw_io.c | 2 +-
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 cdd42e992d6e..4f66b961ef61 100644
--- a/drivers/staging/rtl8723bs/core/rtw_io.c
+++ b/drivers/staging/rtl8723bs/core/rtw_io.c
@@ -101,7 +101,7 @@ int rtw_write16(struct adapter *adapter, u32 addr, u16 val)
ret = _write16(pintfhdl, addr, val);
return RTW_STATUS_CODE(ret);
}
-int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)
+int rtw_write32(struct adapter *adapter, u32 addr, u32 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 88518293839e..3ba413ed3098 100644
--- a/drivers/staging/rtl8723bs/include/rtw_io.h
+++ b/drivers/staging/rtl8723bs/include/rtw_io.h
@@ -176,14 +176,12 @@ 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_write32(struct adapter *adapter, u32 addr, u32 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_write32(adapter, addr, val) _rtw_write32((adapter), (addr), (val))
-
#define rtw_write_port(adapter, addr, cnt, mem) _rtw_write_port((adapter), (addr), (cnt), (mem))
#define rtw_sd_f0_read8(adapter, addr) _rtw_sd_f0_read8((adapter), (addr))
@@ -230,7 +228,4 @@ 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 PlatformEFIOWrite4Byte(_a, _b, _c) \
- rtw_write32(_a, _b, _c)
-
#endif /* _RTL8711_IO_H_ */
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread