2020-12-03 07:30:48

by Alexandru Ardelean

Subject: [PATCH] iio: adc: ti_am335x_adc: remove omitted iio_kfifo_free()

When the conversion was done to use devm_iio_kfifo_allocate(), a call to
iio_kfifo_free() was omitted (to be removed).
This change removes it.

Fixes: 3c5308058899 ("iio: adc: ti_am335x_adc: alloc kfifo & IRQ via devm_ functions")
Signed-off-by: Alexandru Ardelean <[email protected]>
---

Seems I was doing too many things at once when I wrote this.

drivers/iio/adc/ti_am335x_adc.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index b11c8c47ba2a..e946903b0993 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -397,16 +397,12 @@ static int tiadc_iio_buffered_hardware_setup(struct device *dev,
ret = devm_request_threaded_irq(dev, irq, pollfunc_th, pollfunc_bh,
flags, indio_dev->name, indio_dev);
if (ret)
- goto error_kfifo_free;
+ return ret;

indio_dev->setup_ops = setup_ops;
indio_dev->modes |= INDIO_BUFFER_SOFTWARE;

return 0;
-
-error_kfifo_free:
- iio_kfifo_free(indio_dev->buffer);
- return ret;
}

static const char * const chan_name_ain[] = {
--
2.27.0

2020-12-13 18:50:07

by Jonathan Cameron

Subject: Re: [PATCH] iio: adc: ti_am335x_adc: remove omitted iio_kfifo_free()

On Thu, 3 Dec 2020 09:26:50 +0200
Alexandru Ardelean <[email protected]> wrote:

> When the conversion was done to use devm_iio_kfifo_allocate(), a call to
> iio_kfifo_free() was omitted (to be removed).
> This change removes it.
>
> Fixes: 3c5308058899 ("iio: adc: ti_am335x_adc: alloc kfifo & IRQ via devm_ functions")
> Signed-off-by: Alexandru Ardelean <[email protected]>

applied to the fixes-togreg branch of iio.git and marked for stable.

Pull request for this will be sometime soon after rc1.

Thanks,

Jonathan

> ---
>
> Seems I was doing too many things at once when I wrote this.
>
> drivers/iio/adc/ti_am335x_adc.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
> index b11c8c47ba2a..e946903b0993 100644
> --- a/drivers/iio/adc/ti_am335x_adc.c
> +++ b/drivers/iio/adc/ti_am335x_adc.c
> @@ -397,16 +397,12 @@ static int tiadc_iio_buffered_hardware_setup(struct device *dev,
> ret = devm_request_threaded_irq(dev, irq, pollfunc_th, pollfunc_bh,
> flags, indio_dev->name, indio_dev);
> if (ret)
> - goto error_kfifo_free;
> + return ret;
>
> indio_dev->setup_ops = setup_ops;
> indio_dev->modes |= INDIO_BUFFER_SOFTWARE;
>
> return 0;
> -
> -error_kfifo_free:
> - iio_kfifo_free(indio_dev->buffer);
> - return ret;
> }
>
> static const char * const chan_name_ain[] = {