remove wrappers on _rtw_IOL_append_*_cmd

PATCH In review daniel watson 2 participants 7 messages Jun 14, 2022 Staging

lore

Share & tools

lore

daniel watson

author

2022-06-14 02:07 UTC #0 lore raw

cover remove wrappers on _rtw_IOL_append_*_cmd

From: Daniel Watson <[email protected]>

This patchset removes the #define wrappers around the rtl_IOL_append_*_cmd group of functions. They are not needed.

Daniel Watson (4):
staging: r8188eu: remove leading '_' on _rtw_IOL_append_WB_cmd
staging: r8188eu: remove leading '_' on _rtw_IOL_append_WW_cmd
staging: r8188eu: remove leading '_' on _rtw_IOL_append_WD_cmd
staging: r8188eu: remove leading '_' on _rtw_IOL_append_WRF_cmd

 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

daniel watson

author

2022-06-14 02:07 UTC #1 lore raw

PATCH 1/4 staging: r8188eu: remove leading '_' on _rtw_IOL_append_WB_cmd

From: Daniel Watson <[email protected]>

name the function rtw_IOL_append_WB_cmd and call it directly, instead of using wrapper macro

delete wrapper macro, which is not needed

NOTE: code compiles, not tested on hardware

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

---
 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

Dan Carpenter

2022-06-14 14:43 UTC #2 lore raw

Re: [PATCH 1/4] staging: r8188eu: remove leading '_' on _rtw_IOL_append_WB_cmd

Quoted 8 lines · daniel watson

From: Daniel Watson <[email protected]>
name the function rtw_IOL_append_WB_cmd and call it directly, instead of using wrapper macro
delete wrapper macro, which is not needed
NOTE: code compiles, not tested on hardware

Don't put this kind of comment in the commit message. Put it under the --- cut off line.

Quoted 3 lines

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

^^^
Here.

You don't even really need to tell us that you compiled the code, because we take that as a given.

regards,
dan carpenter

daniel watson

author

2022-06-14 02:07 UTC #3 lore raw

PATCH 2/4 staging: r8188eu: remove leading '_' on _rtw_IOL_append_WW_cmd

In reply to daniel watson

From: Daniel Watson <[email protected]>

name the function rtw_IOL_append_WW_cmd and call it directly, instead of using wrapper macro

delete wrapper macro, which is not needed

NOTE: code compiles, not tested on hardware

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

---
 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

daniel watson

author

2022-06-14 02:08 UTC #4 lore raw

PATCH 3/4 staging: r8188eu: remove leading '_' on _rtw_IOL_append_WD_cmd

In reply to daniel watson

From: Daniel Watson <[email protected]>

name the function rtw_IOL_append_WD_cmd and call it directly, instead of using wrapper macro

delete wrapper macro, which is not needed

NOTE: code compiles, not tested on hardware

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

---
 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

daniel watson

author

2022-06-14 02:08 UTC #5 lore raw

PATCH 4/4 staging: r8188eu: remove leading '_' on _rtw_IOL_append_WRF_cmd

In reply to daniel watson

From: Daniel Watson <[email protected]>

name the function rtw_IOL_append_WRF_cmd and call it directly, instead of using wrapper macro

delete wrapper macro, which is not needed

NOTE: code compiles, not tested on hardware

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

staging: r8188eu: remove leading '_' on _rtw_IOL_append_WRF_cmd

call rtw_IOL_append_WRF_cmd directly instead of using wrapper macro delete wrapper macro, which is not needed

NOTE: code compiles, not tested on hardware

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

---
 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

Dan Carpenter

2022-06-14 14:47 UTC #6 lore raw

Re: [PATCH 4/4] staging: r8188eu: remove leading '_' on _rtw_IOL_append_WRF_cmd

Quoted 3 lines · daniel watson

From: Daniel Watson <[email protected]>
name the function rtw_IOL_append_WRF_cmd and call it directly,

^^^^^^^^
Where is the first part of the sentence?

Quoted 11 lines

instead of using wrapper macro
delete wrapper macro, which is not needed
NOTE: code compiles, not tested on hardware
Signed-off-by Daniel Watson <[email protected]>
staging: r8188eu: remove leading '_' on _rtw_IOL_append_WRF_cmd
call rtw_IOL_append_WRF_cmd directly instead of using wrapper macro

This is a better commit message but use a capital C "Call".

Quoted 5 lines

delete wrapper macro, which is not needed
NOTE: code compiles, not tested on hardware
Signed-off-by Daniel Watson <[email protected]>

You have the commit message twice.

regards,
dan carpenter