* [PATCH v2 1/4] staging: r8188eu: call rtw_IOL_append_WB_cmd directly
2022-06-15 0:49 [PATCH v2 0/4] call rtw_IOL_append_*_cmd directly daniel watson
@ 2022-06-15 0:49 ` daniel watson
2022-06-15 0:49 ` [PATCH v2 2/4] staging: r8188eu: call rtw_IOL_append_WW_cmd directly daniel watson
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: daniel watson @ 2022-06-15 0:49 UTC (permalink / raw)
To: Larry Finger, Phillip Potter, Greg Kroah-Hartman, linux-staging,
linux-kernel
Cc: Daniel Watson
From: Daniel Watson <ozzloy@challenge-bot.com>
Call rtf_IOL_append_WB_cmd directly, instead of using wrapper macro.
Delete wrapper macro, which is not needed.
Signed-off-by: Daniel Watson <ozzloy@challenge-bot.com>
---
Changes in v2:
- Make the commit message clearer
Note: This code has not been run on hardware.
drivers/staging/r8188eu/core/rtw_iol.c | 2 +-
drivers/staging/r8188eu/include/rtw_iol.h | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_iol.c b/drivers/staging/r8188eu/core/rtw_iol.c
index af8e84a41b851..8c990b1af5a70 100644
--- a/drivers/staging/r8188eu/core/rtw_iol.c
+++ b/drivers/staging/r8188eu/core/rtw_iol.c
@@ -67,7 +67,7 @@ bool rtw_IOL_applied(struct adapter *adapter)
return false;
}
-int _rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, u8 mask)
+int rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, u8 mask)
{
struct ioreg_cfg cmd = {8, IOREG_CMD_WB_REG, 0x0, 0x0, 0x0};
diff --git a/drivers/staging/r8188eu/include/rtw_iol.h b/drivers/staging/r8188eu/include/rtw_iol.h
index fb88ebc1dabb1..a648f9ba50a62 100644
--- a/drivers/staging/r8188eu/include/rtw_iol.h
+++ b/drivers/staging/r8188eu/include/rtw_iol.h
@@ -41,16 +41,14 @@ int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame);
void read_efuse_from_txpktbuf(struct adapter *adapter, int bcnhead,
u8 *content, u16 *size);
-int _rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr,
- u8 value, u8 mask);
+int rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr,
+ u8 value, u8 mask);
int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr,
u16 value, u16 mask);
int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr,
u32 value, u32 mask);
int _rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path,
u16 addr, u32 value, u32 mask);
-#define rtw_IOL_append_WB_cmd(xmit_frame, addr, value, mask) \
- _rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value) ,(mask))
#define rtw_IOL_append_WW_cmd(xmit_frame, addr, value, mask) \
_rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value),(mask))
#define rtw_IOL_append_WD_cmd(xmit_frame, addr, value, mask) \
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 2/4] staging: r8188eu: call rtw_IOL_append_WW_cmd directly
2022-06-15 0:49 [PATCH v2 0/4] call rtw_IOL_append_*_cmd directly daniel watson
2022-06-15 0:49 ` [PATCH v2 1/4] staging: r8188eu: call rtw_IOL_append_WB_cmd directly daniel watson
@ 2022-06-15 0:49 ` daniel watson
2022-06-15 0:49 ` [PATCH v2 3/4] staging: r8188eu: call rtw_IOL_append_WD_cmd directly daniel watson
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: daniel watson @ 2022-06-15 0:49 UTC (permalink / raw)
To: Larry Finger, Phillip Potter, Greg Kroah-Hartman, linux-staging,
linux-kernel
Cc: Daniel Watson
From: Daniel Watson <ozzloy@challenge-bot.com>
Call rtw_IOL_append_WW_cmd directly, instead of using wrapper macro.
Delete wrapper macro, which is not needed.
Signed-off-by: Daniel Watson <ozzloy@challenge-bot.com>
---
Changes in v2:
- Make the commit message clearer
Note: This code has not been run on hardware.
drivers/staging/r8188eu/core/rtw_iol.c | 2 +-
drivers/staging/r8188eu/include/rtw_iol.h | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_iol.c b/drivers/staging/r8188eu/core/rtw_iol.c
index 8c990b1af5a70..7292bab126074 100644
--- a/drivers/staging/r8188eu/core/rtw_iol.c
+++ b/drivers/staging/r8188eu/core/rtw_iol.c
@@ -81,7 +81,7 @@ int rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, u8
return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, cmd.length);
}
-int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, u16 mask)
+int rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, u16 mask)
{
struct ioreg_cfg cmd = {8, IOREG_CMD_WW_REG, 0x0, 0x0, 0x0};
diff --git a/drivers/staging/r8188eu/include/rtw_iol.h b/drivers/staging/r8188eu/include/rtw_iol.h
index a648f9ba50a62..c99d7d5151099 100644
--- a/drivers/staging/r8188eu/include/rtw_iol.h
+++ b/drivers/staging/r8188eu/include/rtw_iol.h
@@ -43,14 +43,12 @@ void read_efuse_from_txpktbuf(struct adapter *adapter, int bcnhead,
int rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr,
u8 value, u8 mask);
-int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr,
- u16 value, u16 mask);
+int rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr,
+ u16 value, u16 mask);
int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr,
u32 value, u32 mask);
int _rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path,
u16 addr, u32 value, u32 mask);
-#define rtw_IOL_append_WW_cmd(xmit_frame, addr, value, mask) \
- _rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value),(mask))
#define rtw_IOL_append_WD_cmd(xmit_frame, addr, value, mask) \
_rtw_IOL_append_WD_cmd((xmit_frame), (addr), (value), (mask))
#define rtw_IOL_append_WRF_cmd(xmit_frame, rf_path, addr, value, mask) \
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 3/4] staging: r8188eu: call rtw_IOL_append_WD_cmd directly
2022-06-15 0:49 [PATCH v2 0/4] call rtw_IOL_append_*_cmd directly daniel watson
2022-06-15 0:49 ` [PATCH v2 1/4] staging: r8188eu: call rtw_IOL_append_WB_cmd directly daniel watson
2022-06-15 0:49 ` [PATCH v2 2/4] staging: r8188eu: call rtw_IOL_append_WW_cmd directly daniel watson
@ 2022-06-15 0:49 ` daniel watson
2022-06-15 0:49 ` [PATCH v2 4/4] staging: r8188eu: call rtw_IOL_append_WRF_cmd directly daniel watson
2022-06-15 8:37 ` [PATCH v2 0/4] call rtw_IOL_append_*_cmd directly Dan Carpenter
4 siblings, 0 replies; 7+ messages in thread
From: daniel watson @ 2022-06-15 0:49 UTC (permalink / raw)
To: Larry Finger, Phillip Potter, Greg Kroah-Hartman, linux-staging,
linux-kernel
Cc: Daniel Watson
From: Daniel Watson <ozzloy@challenge-bot.com>
Call rtw_IOL_append_WD_cmd directly, instead of using wrapper macro.
Delete wrapper macro, which is not needed.
Signed-off-by: Daniel Watson <ozzloy@challenge-bot.com>
---
Changes in v2:
- Make the commit message clearer
Note: This code has not been run on hardware.
drivers/staging/r8188eu/core/rtw_iol.c | 2 +-
drivers/staging/r8188eu/include/rtw_iol.h | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_iol.c b/drivers/staging/r8188eu/core/rtw_iol.c
index 7292bab126074..b7ee3833c908c 100644
--- a/drivers/staging/r8188eu/core/rtw_iol.c
+++ b/drivers/staging/r8188eu/core/rtw_iol.c
@@ -95,7 +95,7 @@ int rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, u1
return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, cmd.length);
}
-int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, u32 mask)
+int rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, u32 mask)
{
struct ioreg_cfg cmd = {8, IOREG_CMD_WD_REG, 0x0, 0x0, 0x0};
diff --git a/drivers/staging/r8188eu/include/rtw_iol.h b/drivers/staging/r8188eu/include/rtw_iol.h
index c99d7d5151099..9ad467759ef1c 100644
--- a/drivers/staging/r8188eu/include/rtw_iol.h
+++ b/drivers/staging/r8188eu/include/rtw_iol.h
@@ -45,12 +45,10 @@ int rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr,
u8 value, u8 mask);
int rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr,
u16 value, u16 mask);
-int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr,
- u32 value, u32 mask);
+int rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr,
+ u32 value, u32 mask);
int _rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path,
u16 addr, u32 value, u32 mask);
-#define rtw_IOL_append_WD_cmd(xmit_frame, addr, value, mask) \
- _rtw_IOL_append_WD_cmd((xmit_frame), (addr), (value), (mask))
#define rtw_IOL_append_WRF_cmd(xmit_frame, rf_path, addr, value, mask) \
_rtw_IOL_append_WRF_cmd((xmit_frame),(rf_path), (addr), (value), (mask))
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 4/4] staging: r8188eu: call rtw_IOL_append_WRF_cmd directly
2022-06-15 0:49 [PATCH v2 0/4] call rtw_IOL_append_*_cmd directly daniel watson
` (2 preceding siblings ...)
2022-06-15 0:49 ` [PATCH v2 3/4] staging: r8188eu: call rtw_IOL_append_WD_cmd directly daniel watson
@ 2022-06-15 0:49 ` daniel watson
2022-06-15 8:37 ` [PATCH v2 0/4] call rtw_IOL_append_*_cmd directly Dan Carpenter
4 siblings, 0 replies; 7+ messages in thread
From: daniel watson @ 2022-06-15 0:49 UTC (permalink / raw)
To: Larry Finger, Phillip Potter, Greg Kroah-Hartman, linux-staging,
linux-kernel
Cc: Daniel Watson
From: Daniel Watson <ozzloy@challenge-bot.com>
Call rtw_IOL_append_WRF_cmd directly, instead of using wrapper macro.
Delete wrapper macro, which is not needed.
Signed-off-by: Daniel Watson <ozzloy@challenge-bot.com>
---
Changes in v2:
- Make the commit message clearer
Note: This code has not been run on hardware.
drivers/staging/r8188eu/core/rtw_iol.c | 2 +-
drivers/staging/r8188eu/include/rtw_iol.h | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_iol.c b/drivers/staging/r8188eu/core/rtw_iol.c
index b7ee3833c908c..31e196ccd899a 100644
--- a/drivers/staging/r8188eu/core/rtw_iol.c
+++ b/drivers/staging/r8188eu/core/rtw_iol.c
@@ -109,7 +109,7 @@ int rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, u3
return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, cmd.length);
}
-int _rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path, u16 addr, u32 value, u32 mask)
+int rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path, u16 addr, u32 value, u32 mask)
{
struct ioreg_cfg cmd = {8, IOREG_CMD_W_RF, 0x0, 0x0, 0x0};
diff --git a/drivers/staging/r8188eu/include/rtw_iol.h b/drivers/staging/r8188eu/include/rtw_iol.h
index 9ad467759ef1c..099f5a075274c 100644
--- a/drivers/staging/r8188eu/include/rtw_iol.h
+++ b/drivers/staging/r8188eu/include/rtw_iol.h
@@ -47,10 +47,8 @@ int rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr,
u16 value, u16 mask);
int rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr,
u32 value, u32 mask);
-int _rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path,
- u16 addr, u32 value, u32 mask);
-#define rtw_IOL_append_WRF_cmd(xmit_frame, rf_path, addr, value, mask) \
- _rtw_IOL_append_WRF_cmd((xmit_frame),(rf_path), (addr), (value), (mask))
+int rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path,
+ u16 addr, u32 value, u32 mask);
u8 rtw_IOL_cmd_boundary_handle(struct xmit_frame *pxmit_frame);
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2 0/4] call rtw_IOL_append_*_cmd directly
2022-06-15 0:49 [PATCH v2 0/4] call rtw_IOL_append_*_cmd directly daniel watson
` (3 preceding siblings ...)
2022-06-15 0:49 ` [PATCH v2 4/4] staging: r8188eu: call rtw_IOL_append_WRF_cmd directly daniel watson
@ 2022-06-15 8:37 ` Dan Carpenter
2022-06-15 17:16 ` daniel watson
4 siblings, 1 reply; 7+ messages in thread
From: Dan Carpenter @ 2022-06-15 8:37 UTC (permalink / raw)
To: daniel watson
Cc: Larry Finger, Phillip Potter, Greg Kroah-Hartman, linux-staging,
linux-kernel
On Tue, Jun 14, 2022 at 05:49:24PM -0700, daniel watson wrote:
> From: Daniel Watson <ozzloy@challenge-bot.com>
>
> This patchset calls the rtw_IOL_append_*_cmd group of functions
> directly and removes the #define wrappers.
>
> Daniel Watson (4):
> staging: r8188eu: call rtw_IOL_append_WB_cmd directly
> staging: r8188eu: call rtw_IOL_append_WW_cmd directly
> staging: r8188eu: call rtw_IOL_append_WD_cmd directly
> staging: r8188eu: call rtw_IOL_append_WRF_cmd directly
>
Looks good, thanks!
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
regards,
dan carpenter
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2 0/4] call rtw_IOL_append_*_cmd directly
2022-06-15 8:37 ` [PATCH v2 0/4] call rtw_IOL_append_*_cmd directly Dan Carpenter
@ 2022-06-15 17:16 ` daniel watson
0 siblings, 0 replies; 7+ messages in thread
From: daniel watson @ 2022-06-15 17:16 UTC (permalink / raw)
To: Dan Carpenter
Cc: Larry Finger, Phillip Potter, Greg Kroah-Hartman, linux-staging,
linux-kernel
On Wed, Jun 15, 2022 at 11:37:15AM +0300, Dan Carpenter wrote:
> On Tue, Jun 14, 2022 at 05:49:24PM -0700, daniel watson wrote:
> > From: Daniel Watson <ozzloy@challenge-bot.com>
> >
> > This patchset calls the rtw_IOL_append_*_cmd group of functions
> > directly and removes the #define wrappers.
> >
>
> Looks good, thanks!
>
> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> regards,
> dan carpenter
>
Thanks! I noticed a typo in the first commit message.
I'll send a v3 to fix it.
^ permalink raw reply [flat|nested] 7+ messages in thread