Re: [PATCH 8/8] iio: buffer: drop devm_iio_kfifo_free() API call
From: Jonathan Cameron
Date: Sun Apr 12 2020 - 09:01:17 EST
On Thu, 27 Feb 2020 15:52:27 +0200
Alexandru Ardelean <alexandru.ardelean@xxxxxxxxxx> wrote:
> It's unused so far, so it can't be removed. Also makes sense to remove it
> to discourage weird uses of this call during review.
>
> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@xxxxxxxxxx>
Applied with the can't -> can above fixed up.
Thanks,
Jonathan
> ---
> .../driver-api/driver-model/devres.rst | 1 -
> drivers/iio/buffer/kfifo_buf.c | 22 -------------------
> include/linux/iio/kfifo_buf.h | 1 -
> 3 files changed, 24 deletions(-)
>
> diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst
> index 10ccebe9f7c1..91b0b8e5556c 100644
> --- a/Documentation/driver-api/driver-model/devres.rst
> +++ b/Documentation/driver-api/driver-model/devres.rst
> @@ -286,7 +286,6 @@ IIO
> devm_iio_device_alloc()
> devm_iio_device_register()
> devm_iio_kfifo_allocate()
> - devm_iio_kfifo_free()
> devm_iio_triggered_buffer_setup()
> devm_iio_trigger_alloc()
> devm_iio_trigger_register()
> diff --git a/drivers/iio/buffer/kfifo_buf.c b/drivers/iio/buffer/kfifo_buf.c
> index 3150f8ab984b..1359abed3b31 100644
> --- a/drivers/iio/buffer/kfifo_buf.c
> +++ b/drivers/iio/buffer/kfifo_buf.c
> @@ -179,16 +179,6 @@ static void devm_iio_kfifo_release(struct device *dev, void *res)
> iio_kfifo_free(*(struct iio_buffer **)res);
> }
>
> -static int devm_iio_kfifo_match(struct device *dev, void *res, void *data)
> -{
> - struct iio_buffer **r = res;
> -
> - if (WARN_ON(!r || !*r))
> - return 0;
> -
> - return *r == data;
> -}
> -
> /**
> * devm_iio_fifo_allocate - Resource-managed iio_kfifo_allocate()
> * @dev: Device to allocate kfifo buffer for
> @@ -216,16 +206,4 @@ struct iio_buffer *devm_iio_kfifo_allocate(struct device *dev)
> }
> EXPORT_SYMBOL(devm_iio_kfifo_allocate);
>
> -/**
> - * devm_iio_fifo_free - Resource-managed iio_kfifo_free()
> - * @dev: Device the buffer belongs to
> - * @r: The buffer associated with the device
> - */
> -void devm_iio_kfifo_free(struct device *dev, struct iio_buffer *r)
> -{
> - WARN_ON(devres_release(dev, devm_iio_kfifo_release,
> - devm_iio_kfifo_match, r));
> -}
> -EXPORT_SYMBOL(devm_iio_kfifo_free);
> -
> MODULE_LICENSE("GPL");
> diff --git a/include/linux/iio/kfifo_buf.h b/include/linux/iio/kfifo_buf.h
> index 764659e01b68..1fc1efa7799d 100644
> --- a/include/linux/iio/kfifo_buf.h
> +++ b/include/linux/iio/kfifo_buf.h
> @@ -9,6 +9,5 @@ struct iio_buffer *iio_kfifo_allocate(void);
> void iio_kfifo_free(struct iio_buffer *r);
>
> struct iio_buffer *devm_iio_kfifo_allocate(struct device *dev);
> -void devm_iio_kfifo_free(struct device *dev, struct iio_buffer *r);
>
> #endif