Re: [Outreachy kernel] [PATCH 21/24] staging: iio: meter: remove unused variables

[Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>]

On Fri, Feb 27, 2015 at 06:00:53PM +0200, Daniel Baluta wrote:
> On Fri, Feb 27, 2015 at 3:09 PM, Aya Mahfouz
> <mahfouz.saif.elyazal@gmail.com> wrote:
> > This patch removes variables that were simply used to store the
> > return value of a function call before returning it.
> >
> > The issue was detected and resolved using the following
> > coccinelle script:
> >
> > @@
> > identifier len,f;
> > @@
> >
> > -int len;
> >  ... when != len
> >      when strict
> > -len =
> > +return
> >         f(...);
> > -return len;
> >
> > Signed-off-by: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>
> > ---
> >  drivers/staging/iio/meter/ade7758_core.c | 10 ++--------
> >  1 file changed, 2 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
> > index 70e96b2..3d2fae4 100644
> > --- a/drivers/staging/iio/meter/ade7758_core.c
> > +++ b/drivers/staging/iio/meter/ade7758_core.c
> > @@ -300,18 +300,15 @@ error_ret:
> >
> >  static int ade7758_reset(struct device *dev)
> >  {
> > -       int ret;
> >         u8 val;
> >
> >         ade7758_spi_read_reg_8(dev,
> >                         ADE7758_OPMODE,
> >                         &val);
> >         val |= 1 << 6; /* Software Chip Reset */
> > -       ret = ade7758_spi_write_reg_8(dev,
> > +       return ade7758_spi_write_reg_8(dev,
> >                         ADE7758_OPMODE,
> >                         val);
> > -
> > -       return ret;
> >  }
> >
> >  static IIO_DEV_ATTR_VPEAK(S_IWUSR | S_IRUGO,
> > @@ -441,18 +438,15 @@ error_ret:
> >  /* Power down the device */
> >  static int ade7758_stop_device(struct device *dev)
> >  {
> > -       int ret;
> >         u8 val;
> >
> >         ade7758_spi_read_reg_8(dev,
> >                         ADE7758_OPMODE,
> >                         &val);
> >         val |= 7 << 3;  /* ADE7758 powered down */
> > -       ret = ade7758_spi_write_reg_8(dev,
> > +       return ade7758_spi_write_reg_8(dev,
> >                         ADE7758_OPMODE,
> >                         val);
> > -
> > -       return ret;
> >  }
> >
> 
> I would advise against this change. It would be better to check
> for ret value and add an error message.
>
Sure thing. I will read the documentation of this code and send
a second patch by tomorrow. 

Thanks for your feedback Daniel.

> Daniel.

-- 
Kind Regards,
Aya Saif El-yazal Mahfouz