Re: [PATCH 7/8] iio: buffer: drop devm_iio_hw_consumer_free() API call

From: Jonathan Cameron
Date: Sun Apr 12 2020 - 09:00:32 EST


On Thu, 27 Feb 2020 15:52:26 +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 thanks.

Though just notice you have a can't where it should be can in the patch
description. Will fix that up.

Thanks,

Jonathan

> ---
> drivers/iio/buffer/industrialio-hw-consumer.c | 31 -------------------
> include/linux/iio/hw-consumer.h | 1 -
> 2 files changed, 32 deletions(-)
>
> diff --git a/drivers/iio/buffer/industrialio-hw-consumer.c b/drivers/iio/buffer/industrialio-hw-consumer.c
> index 95165697d8ae..f2d27788f666 100644
> --- a/drivers/iio/buffer/industrialio-hw-consumer.c
> +++ b/drivers/iio/buffer/industrialio-hw-consumer.c
> @@ -142,17 +142,6 @@ static void devm_iio_hw_consumer_release(struct device *dev, void *res)
> iio_hw_consumer_free(*(struct iio_hw_consumer **)res);
> }
>
> -static int devm_iio_hw_consumer_match(struct device *dev, void *res, void *data)
> -{
> - struct iio_hw_consumer **r = res;
> -
> - if (!r || !*r) {
> - WARN_ON(!r || !*r);
> - return 0;
> - }
> - return *r == data;
> -}
> -
> /**
> * devm_iio_hw_consumer_alloc - Resource-managed iio_hw_consumer_alloc()
> * @dev: Pointer to consumer device.
> @@ -160,9 +149,6 @@ static int devm_iio_hw_consumer_match(struct device *dev, void *res, void *data)
> * Managed iio_hw_consumer_alloc. iio_hw_consumer allocated with this function
> * is automatically freed on driver detach.
> *
> - * If an iio_hw_consumer allocated with this function needs to be freed
> - * separately, devm_iio_hw_consumer_free() must be used.
> - *
> * returns pointer to allocated iio_hw_consumer on success, NULL on failure.
> */
> struct iio_hw_consumer *devm_iio_hw_consumer_alloc(struct device *dev)
> @@ -186,23 +172,6 @@ struct iio_hw_consumer *devm_iio_hw_consumer_alloc(struct device *dev)
> }
> EXPORT_SYMBOL_GPL(devm_iio_hw_consumer_alloc);
>
> -/**
> - * devm_iio_hw_consumer_free - Resource-managed iio_hw_consumer_free()
> - * @dev: Pointer to consumer device.
> - * @hwc: iio_hw_consumer to free.
> - *
> - * Free iio_hw_consumer allocated with devm_iio_hw_consumer_alloc().
> - */
> -void devm_iio_hw_consumer_free(struct device *dev, struct iio_hw_consumer *hwc)
> -{
> - int rc;
> -
> - rc = devres_release(dev, devm_iio_hw_consumer_release,
> - devm_iio_hw_consumer_match, hwc);
> - WARN_ON(rc);
> -}
> -EXPORT_SYMBOL_GPL(devm_iio_hw_consumer_free);
> -
> /**
> * iio_hw_consumer_enable() - Enable IIO hardware consumer
> * @hwc: iio_hw_consumer to enable.
> diff --git a/include/linux/iio/hw-consumer.h b/include/linux/iio/hw-consumer.h
> index 44d48bb1d39f..e8255c2e33bc 100644
> --- a/include/linux/iio/hw-consumer.h
> +++ b/include/linux/iio/hw-consumer.h
> @@ -14,7 +14,6 @@ struct iio_hw_consumer;
> struct iio_hw_consumer *iio_hw_consumer_alloc(struct device *dev);
> void iio_hw_consumer_free(struct iio_hw_consumer *hwc);
> struct iio_hw_consumer *devm_iio_hw_consumer_alloc(struct device *dev);
> -void devm_iio_hw_consumer_free(struct device *dev, struct iio_hw_consumer *hwc);
> int iio_hw_consumer_enable(struct iio_hw_consumer *hwc);
> void iio_hw_consumer_disable(struct iio_hw_consumer *hwc);
>