Skip to contentSkip to conversation

staging: rtl8723bs: rtw_cmd: Compress lines for immediate return

PATCH In review Simran Singhal 2 participants 2 messages Mar 25, 2020 – Mar 30, 2020 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8723bs: rtw_cmd: Compress lines for immediate return

Compress two lines into a single line if immediate return statement is found. It also removes variable cmd_obj as it is no longer needed.

It is done using script Coccinelle.
And coccinelle uses following semantic patch for this compression function:

@@
expression ret;
identifier f;
@@

-ret =
+return

     f(...);

-return ret;

---
 drivers/staging/rtl8723bs/core/rtw_cmd.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -5
index 744b40dd4cf0..42b0ea8abd9c 100644
@@ -362,11 +362,7 @@ int rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
 
 struct	cmd_obj	*rtw_dequeue_cmd(struct cmd_priv *pcmdpriv)
 {
-	struct cmd_obj *cmd_obj;
-
-	cmd_obj = _rtw_dequeue_cmd(&pcmdpriv->cmd_queue);
-
-	return cmd_obj;
+	return _rtw_dequeue_cmd(&pcmdpriv->cmd_queue);
 }
 
 void rtw_free_cmd_obj(struct cmd_obj *pcmd)
Signature · 1 line
2.17.1
#1 lore raw
Quoted 4 lines · On Thu, 26 Mar 2020 02:52:53 +0530 Simran Singhal <[email protected]>…

Compress two lines into a single line if immediate return statement is found. It also removes variable cmd_obj as it is no longer needed.

It is done using script Coccinelle.

This should be consistent. What does "it" refer to, now? If you start with an imperative mode, switching to indicative makes it hard to follow.

By the way, Coccinelle is not exactly a script. Saying something is detected by Coccinelle is enough, you don't need to qualify that further.

Signature · 1 line
Stefano