Skip to contentSkip to conversation

call rtw_IOL_append_*_cmd directly

PATCH Superseded daniel watson 2 participants 7 messages Jun 15, 2022 Staging

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

daniel watson

author
#0 lore raw

v2 cover call rtw_IOL_append_*_cmd directly

From: Daniel Watson <[email protected]>

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

 drivers/staging/r8188eu/core/rtw_iol.c    |  8 ++++----
 drivers/staging/r8188eu/include/rtw_iol.h | 24 ++++++++---------------
 2 files changed, 12 insertions(+), 20 deletions(-)
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH v2 1/4 staging: r8188eu: call rtw_IOL_append_WB_cmd directly

From: Daniel Watson <[email protected]>

Call rtf_IOL_append_WB_cmd directly, instead of using wrapper macro.

Delete wrapper macro, which is not needed.

Signed-off-by Daniel Watson <[email protected]>

---
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(-)
drivers/staging/r8188eu/core/rtw_iol.c +1 -1
index af8e84a41b851..8c990b1af5a70 100644
@@ -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};
drivers/staging/r8188eu/include/rtw_iol.h +2 -4
index fb88ebc1dabb1..a648f9ba50a62 100644
@@ -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)		\
Signature · 1 line
2.34.1
author
#2 lore raw

PATCH v2 2/4 staging: r8188eu: call rtw_IOL_append_WW_cmd directly

In reply to daniel watson

From: Daniel Watson <[email protected]>

Call rtw_IOL_append_WW_cmd directly, instead of using wrapper macro.

Delete wrapper macro, which is not needed.

Signed-off-by Daniel Watson <[email protected]>

---
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(-)
drivers/staging/r8188eu/core/rtw_iol.c +1 -1
index 8c990b1af5a70..7292bab126074 100644
@@ -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};
drivers/staging/r8188eu/include/rtw_iol.h +2 -4
index a648f9ba50a62..c99d7d5151099 100644
@@ -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)	\
Signature · 1 line
2.34.1
author
#3 lore raw

PATCH v2 3/4 staging: r8188eu: call rtw_IOL_append_WD_cmd directly

In reply to daniel watson

From: Daniel Watson <[email protected]>

Call rtw_IOL_append_WD_cmd directly, instead of using wrapper macro.

Delete wrapper macro, which is not needed.

Signed-off-by Daniel Watson <[email protected]>

---
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(-)
drivers/staging/r8188eu/core/rtw_iol.c +1 -1
index 7292bab126074..b7ee3833c908c 100644
@@ -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};
drivers/staging/r8188eu/include/rtw_iol.h +2 -4
index c99d7d5151099..9ad467759ef1c 100644
@@ -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))
Signature · 1 line
2.34.1
author
#4 lore raw

PATCH v2 4/4 staging: r8188eu: call rtw_IOL_append_WRF_cmd directly

In reply to daniel watson

From: Daniel Watson <[email protected]>

Call rtw_IOL_append_WRF_cmd directly, instead of using wrapper macro.

Delete wrapper macro, which is not needed.

Signed-off-by Daniel Watson <[email protected]>

---
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(-)
drivers/staging/r8188eu/core/rtw_iol.c +1 -1
index b7ee3833c908c..31e196ccd899a 100644
@@ -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};
drivers/staging/r8188eu/include/rtw_iol.h +2 -4
index 9ad467759ef1c..099f5a075274c 100644
@@ -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);
Signature · 1 line
2.34.1
Reviewed-by on the v2 series
#5 lore raw
In reply to daniel watson
Quoted 11 lines · daniel watson

From: Daniel Watson <[email protected]>

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 <[email protected]>

regards,
dan carpenter

author
#6 lore raw
Quoted 7 lines · Dan Carpenter
Quoted 5 lines · daniel watson

From: Daniel Watson <[email protected]>

This patchset calls the rtw_IOL_append_*_cmd group of functions directly and removes the #define wrappers.

Quoted 7 lines

Looks good, thanks!

Reviewed-by Dan Carpenter <[email protected]>

regards,
dan carpenter

Thanks! I noticed a typo in the first commit message. I'll send a v3 to fix it.