Skip to contentSkip to conversation

staging: vt6655: Compress return logic

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

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 staging: vt6655: Compress return logic

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;

---
 drivers/staging/vt6655/card.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/vt6655/card.c +1 -1
index e0c9281..b513846 100644
@@ -920,7 +920,7 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2)
 
 	qwTSFOffset = qwTSF1 - qwTSF2;
 
-	return qwTSFOffset;
+	return qwTSF1 - qwTSF2;
 }
 
 /*
Signature · 1 line
2.7.4
#1 lore raw
Quoted 23 lines · simran singhal

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;
---
 drivers/staging/vt6655/card.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/vt6655/card.c +0 -0
index e0c9281..b513846 100644

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

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

It looks like you can completely get rid of the variable qwTSFOffset as well.

Actually, it seems that you didn't use the patch that Coccinelle gave you, because that should have removed the assignment also. By default Coccinelle prints a patch on standard output. You can redirect that into a file, and if you like it, you can apply it to your code, using patch -p1 < {file}. Another option is the --in-place argument to spatch. Then you would want to do git diff afterwards to see what Coccinelle did.

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/20170218202056.GA3995%40singhal-Inspiron-5558.
For more options, visit https://groups.google.com/d/optout.

#2 lore raw
In reply to simran singhal

Review

Quoted 12 lines · simran singhal

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;

[]

drivers/staging/vt6655/card.c

Quoted 1 line
drivers/staging/vt6655/card.c +0 -0

[]

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

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

It's not a problem here but generically, this transformation may introduce defects when the local idexpression being assigned to is a smaller type than the return type. e.g.:

u64 foo(u64 a, u64 b)

{
	u8 bar = a - b;
	return bar;
}