Skip to contentSkip to conversation

staging: vt6655: Compress return logic

PATCH Superseded simran singhal 2 participants 2 messages Feb 18, 2017 Staging

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/6 staging: vt6655: Compress return logic

[email protected],[email protected],[email protected],[email protected] Bcc:
Subject: [PATCH v2 1/6] staging: vt6655: Compress return logic
Reply-To:

Simplify function returns by merging assignment and return into one command line.
Found with Coccinelle
@@
local idexpression ret;
expression e;
@@

-ret =
+return

     e;

-return ret;

---

v2:
-Removed assignment

 drivers/staging/vt6655/card.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/vt6655/card.c +1 -3
index e0c9281..9a8999f 100644
@@ -918,9 +918,7 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2)
 
 	qwTSF2 += (u64)wRxBcnTSFOffst;
 
-	qwTSFOffset = qwTSF1 - qwTSF2;
-
-	return qwTSFOffset;
+	return qwTSF1 - qwTSF2;
 }
 
 /*
Signature · 1 line
2.7.4
#1 lore raw
Quoted 4 lines · simran singhal

[email protected],[email protected],[email protected],[email protected] Bcc:
Subject: [PATCH v2 1/6] staging: vt6655: Compress return logic
Reply-To:

This didn't come out well.

Quoted 28 lines

Simplify function returns by merging assignment and return into one command line.
Found with Coccinelle
@@
local idexpression ret;
expression e;
@@

(quoted diff) +1 -2
-ret =
+return
     e;
-return ret;

---

v2:
-Removed assignment

 drivers/staging/vt6655/card.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/vt6655/card.c +0 -0
index e0c9281..9a8999f 100644

drivers/staging/vt6655/card.c u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2) · line 921

Quoted 7 lines
drivers/staging/vt6655/card.c +1 -3
@@ -918,9 +918,7 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2)
 
 	qwTSF2 += (u64)wRxBcnTSFOffst;
 
-	qwTSFOffset = qwTSF1 - qwTSF2;
-
-	return qwTSFOffset;
+	return qwTSF1 - qwTSF2;

It's not just the assignment that can go. All mentions of the variable are useless, ie the declaration too.

julia

Quoted 13 lines
drivers/staging/vt6655/card.c +0 -1
 }
 
 /*
--

2.7.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20170218210740.GA14258%40singhal-Inspiron-5558.
For more options, visit https://groups.google.com/d/optout.