Skip to contentSkip to conversation

staging: vt6656: Compress return logic into one line.

PATCH New Elise Lennion 1 participant 1 message Oct 17, 2016 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 staging: vt6656: Compress return logic into one line.

Compress the return logic into one line avoids unnecessary variable declarations. In this case it also makes it easier to understand the function.

Coccinelle was used to find this return statement. However, additional compressions were done to make the function clearer.

Semantic patch:
@@
local idexpression ret;
expression e;
@@

-ret =
+return

     e;

-return ret;

---
 drivers/staging/vt6656/card.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/staging/vt6656/card.c +1 -10
index 807d3f7..0e5a993 100644
@@ -501,16 +501,7 @@ u8 vnt_get_pkt_type(struct vnt_private *priv)
  */
 u64 vnt_get_tsf_offset(u8 rx_rate, u64 tsf1, u64 tsf2)
 {
-	u64 tsf_offset = 0;
-	u16 rx_bcn_offset;
-
-	rx_bcn_offset = cw_rxbcntsf_off[rx_rate % MAX_RATE];
-
-	tsf2 += (u64)rx_bcn_offset;
-
-	tsf_offset = tsf1 - tsf2;
-
-	return tsf_offset;
+	return tsf1 - tsf2 - (u64)cw_rxbcntsf_off[rx_rate % MAX_RATE];
 }
 
 /*
Signature · 1 line
2.7.4