2017-03-10 03:57:44

by Bo YU

Subject: [PATCH] Staging: iio: return expression instead of return ret

The following Coccinelle script was used to detect this:

@@
local idexpression ret;
expression e;
@@

-ret =
+return
e;
-return ret;

Signed-off-by: Bo YU <[email protected]>
---
drivers/staging/iio/meter/ade7754.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
index 024463a11c47..19f8cb144768 100644
--- a/drivers/staging/iio/meter/ade7754.c
+++ b/drivers/staging/iio/meter/ade7754.c
@@ -349,9 +349,8 @@ static int ade7754_set_irq(struct device *dev, bool enable)
else
irqen &= ~BIT(14);

- ret = ade7754_spi_write_reg_16(dev, ADE7754_IRQEN, irqen);
+ return ade7754_spi_write_reg_16(dev, ADE7754_IRQEN, irqen);

- return ret;
}

/* Power down the device */
--
1.7.10.4

2017-03-11 18:25:34

by Jonathan Cameron

Subject: Re: [PATCH] Staging: iio: return expression instead of return ret

On 10/03/17 03:57, Bo Yu wrote:
> The following Coccinelle script was used to detect this:
>
> @@
> local idexpression ret;
> expression e;
> @@
>
> -ret =
> +return
> e;
> -return ret;

A bit of fuzz on this one. Presumably things moving around in other recent
changes.

Anyhow, applied to the togreg branch of iio.git. Will push out as testing
shortly for the autobuilders to play with it.

Thanks,

Jonathan
>
> Signed-off-by: Bo YU <[email protected]>
> ---
> drivers/staging/iio/meter/ade7754.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
> index 024463a11c47..19f8cb144768 100644
> --- a/drivers/staging/iio/meter/ade7754.c
> +++ b/drivers/staging/iio/meter/ade7754.c
> @@ -349,9 +349,8 @@ static int ade7754_set_irq(struct device *dev, bool enable)
> else
> irqen &= ~BIT(14);
>
> - ret = ade7754_spi_write_reg_16(dev, ADE7754_IRQEN, irqen);
> + return ade7754_spi_write_reg_16(dev, ADE7754_IRQEN, irqen);
>
> - return ret;
> }
>
> /* Power down the device */
> --
> 1.7.10.4
>