iio: frequency: admv1014: return -EINVAL directly

[PATCH] iio: frequency: admv1014: return -EINVAL directly

Posted by Antoniu Miclaus 3 years, 7 months ago

Remove extra step where the error code is assigned to the `ret`
variable.

Return instead error code directly.

Fixes: f4eb9ac ("iio: frequency: admv1014: add support for ADMV1014")
Signed-off-by: Antoniu Miclaus <antoniu.miclaus@analog.com>
---
 drivers/iio/frequency/admv1014.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/iio/frequency/admv1014.c b/drivers/iio/frequency/admv1014.c
index 865addd10db4..bb5e1feef42b 100644
--- a/drivers/iio/frequency/admv1014.c
+++ b/drivers/iio/frequency/admv1014.c
@@ -669,8 +669,7 @@ static int admv1014_init(struct admv1014_state *st)
 	chip_id = FIELD_GET(ADMV1014_CHIP_ID_MSK, chip_id);
 	if (chip_id != ADMV1014_CHIP_ID) {
 		dev_err(&spi->dev, "Invalid Chip ID.\n");
-		ret = -EINVAL;
-		return ret;
+		return -EINVAL;
 	}
 
 	ret = __admv1014_spi_update_bits(st, ADMV1014_REG_QUAD,
-- 
2.37.2

Re: [PATCH] iio: frequency: admv1014: return -EINVAL directly

Posted by Jonathan Cameron 3 years, 7 months ago

On Fri, 19 Aug 2022 13:41:17 +0300
Antoniu Miclaus <antoniu.miclaus@analog.com> wrote:

> Remove extra step where the error code is assigned to the `ret`
> variable.
> 
> Return instead error code directly.
> 
> Fixes: f4eb9ac ("iio: frequency: admv1014: add support for ADMV1014")
> Signed-off-by: Antoniu Miclaus <antoniu.miclaus@analog.com>
Change is fine, but I've dropped the fixes tag. The code before this
wasn't broken, just longer than it needed to be. We don't want the noise
of this getting backported because someone sees the fixes tag and thinks
there is a reason it needs to be.

Applied to the togreg branch of iio.git
Thanks,

Jonathan


 
> ---
>  drivers/iio/frequency/admv1014.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/frequency/admv1014.c b/drivers/iio/frequency/admv1014.c
> index 865addd10db4..bb5e1feef42b 100644
> --- a/drivers/iio/frequency/admv1014.c
> +++ b/drivers/iio/frequency/admv1014.c
> @@ -669,8 +669,7 @@ static int admv1014_init(struct admv1014_state *st)
>  	chip_id = FIELD_GET(ADMV1014_CHIP_ID_MSK, chip_id);
>  	if (chip_id != ADMV1014_CHIP_ID) {
>  		dev_err(&spi->dev, "Invalid Chip ID.\n");
> -		ret = -EINVAL;
> -		return ret;
> +		return -EINVAL;
>  	}
>  
>  	ret = __admv1014_spi_update_bits(st, ADMV1014_REG_QUAD,

Re: [PATCH] iio: frequency: admv1014: return -EINVAL directly

Posted by Andy Shevchenko 3 years, 7 months ago

On Fri, Aug 19, 2022 at 8:41 PM Jonathan Cameron <jic23@kernel.org> wrote:
> On Fri, 19 Aug 2022 13:41:17 +0300
> Antoniu Miclaus <antoniu.miclaus@analog.com> wrote:
>
> > Remove extra step where the error code is assigned to the `ret`
> > variable.
> >
> > Return instead error code directly.

...

> Change is fine, but I've dropped the fixes tag. The code before this
> wasn't broken, just longer than it needed to be. We don't want the noise
> of this getting backported because someone sees the fixes tag and thinks
> there is a reason it needs to be.
>
> Applied to the togreg branch of iio.git

Haven't checked myself if it's possible, but shouldn;'t we go further
and return dev_err_probe()?

> >       chip_id = FIELD_GET(ADMV1014_CHIP_ID_MSK, chip_id);
> >       if (chip_id != ADMV1014_CHIP_ID) {
> >               dev_err(&spi->dev, "Invalid Chip ID.\n");
> > -             ret = -EINVAL;
> > -             return ret;
> > +             return -EINVAL;
> >       }


-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH] iio: frequency: admv1014: return -EINVAL directly

Posted by Jonathan Cameron 3 years, 7 months ago

On Sat, 20 Aug 2022 18:56:53 +0300
Andy Shevchenko <andy.shevchenko@gmail.com> wrote:

> On Fri, Aug 19, 2022 at 8:41 PM Jonathan Cameron <jic23@kernel.org> wrote:
> > On Fri, 19 Aug 2022 13:41:17 +0300
> > Antoniu Miclaus <antoniu.miclaus@analog.com> wrote:
> >  
> > > Remove extra step where the error code is assigned to the `ret`
> > > variable.
> > >
> > > Return instead error code directly.  
> 
> ...
> 
> > Change is fine, but I've dropped the fixes tag. The code before this
> > wasn't broken, just longer than it needed to be. We don't want the noise
> > of this getting backported because someone sees the fixes tag and thinks
> > there is a reason it needs to be.
> >
> > Applied to the togreg branch of iio.git  
> 
> Haven't checked myself if it's possible, but shouldn;'t we go further
> and return dev_err_probe()?

Good idea, but only as part of a patch doing that throughout the driver.
So follow up patch perhaps..

> 
> > >       chip_id = FIELD_GET(ADMV1014_CHIP_ID_MSK, chip_id);
> > >       if (chip_id != ADMV1014_CHIP_ID) {
> > >               dev_err(&spi->dev, "Invalid Chip ID.\n");
> > > -             ret = -EINVAL;
> > > -             return ret;
> > > +             return -EINVAL;
> > >       }  
> 
>