From: Tina Johnson <tinajohnson.1234@gmail.com>
Date: Sun, 14 Sep 2014 11:00:05 +0000 (+0530)
Subject: Staging: iio: meter: ade7753: Merged assignment with immediately following return... 
X-Git-Tag: v3.18-rc1~130^2~382
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9034720a54738bbaf96b619f34f887199ac7efed;p=karo-tx-linux.git

Staging: iio: meter: ade7753: Merged assignment with immediately following return statement

Saved one line of code by merging the assigning and return statements
of variable ret. And thus removed variable len which was no longer useful.

This patch was done using Coccinelle script and the following semantic
patch was used:

@@
expression ret;
identifier f;
@@

-ret =
+return
      f(...);
-return ret;

Signed-off-by: Tina Johnson <tinajohnson.1234@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Acked-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
index 00492cad7c57..7161c61fc6eb 100644
--- a/drivers/staging/iio/meter/ade7753.c
+++ b/drivers/staging/iio/meter/ade7753.c
@@ -377,7 +377,7 @@ static ssize_t ade7753_read_frequency(struct device *dev,
 		struct device_attribute *attr,
 		char *buf)
 {
-	int ret, len = 0;
+	int ret;
 	u16 t;
 	int sps;
 	ret = ade7753_spi_read_reg_16(dev, ADE7753_MODE, &t);
@@ -387,8 +387,7 @@ static ssize_t ade7753_read_frequency(struct device *dev,
 	t = (t >> 11) & 0x3;
 	sps = 27900 / (1 + t);
 
-	len = sprintf(buf, "%d\n", sps);
-	return len;
+	return sprintf(buf, "%d\n", sps);
 }
 
 static ssize_t ade7753_write_frequency(struct device *dev,