Re: [PATCH 6/8] iio: inkern: drop devm_iio_channel_release{_all} API calls

[Jonathan Cameron]

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

Jonathan

> ---
>  .../driver-api/driver-model/devres.rst        |  2 --
>  drivers/iio/inkern.c                          | 27 -------------------
>  include/linux/iio/consumer.h                  | 18 -------------
>  3 files changed, 47 deletions(-)
> 
> diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst
> index 6c401c74e480..10ccebe9f7c1 100644
> --- a/Documentation/driver-api/driver-model/devres.rst
> +++ b/Documentation/driver-api/driver-model/devres.rst
> @@ -291,9 +291,7 @@ IIO
>    devm_iio_trigger_alloc()
>    devm_iio_trigger_register()
>    devm_iio_channel_get()
> -  devm_iio_channel_release()
>    devm_iio_channel_get_all()
> -  devm_iio_channel_release_all()
>  
>  INPUT
>    devm_input_allocate_device()
> diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
> index 5a8351c9a426..ede99e0d5371 100644
> --- a/drivers/iio/inkern.c
> +++ b/drivers/iio/inkern.c
> @@ -360,18 +360,6 @@ static void devm_iio_channel_free(struct device *dev, void *res)
>  	iio_channel_release(channel);
>  }
>  
> -static int devm_iio_channel_match(struct device *dev, void *res, void *data)
> -{
> -	struct iio_channel **r = res;
> -
> -	if (!r || !*r) {
> -		WARN_ON(!r || !*r);
> -		return 0;
> -	}
> -
> -	return *r == data;
> -}
> -
>  struct iio_channel *devm_iio_channel_get(struct device *dev,
>  					 const char *channel_name)
>  {
> @@ -394,13 +382,6 @@ struct iio_channel *devm_iio_channel_get(struct device *dev,
>  }
>  EXPORT_SYMBOL_GPL(devm_iio_channel_get);
>  
> -void devm_iio_channel_release(struct device *dev, struct iio_channel *channel)
> -{
> -	WARN_ON(devres_release(dev, devm_iio_channel_free,
> -			       devm_iio_channel_match, channel));
> -}
> -EXPORT_SYMBOL_GPL(devm_iio_channel_release);
> -
>  struct iio_channel *iio_channel_get_all(struct device *dev)
>  {
>  	const char *name;
> @@ -514,14 +495,6 @@ struct iio_channel *devm_iio_channel_get_all(struct device *dev)
>  }
>  EXPORT_SYMBOL_GPL(devm_iio_channel_get_all);
>  
> -void devm_iio_channel_release_all(struct device *dev,
> -				  struct iio_channel *channels)
> -{
> -	WARN_ON(devres_release(dev, devm_iio_channel_free_all,
> -			       devm_iio_channel_match, channels));
> -}
> -EXPORT_SYMBOL_GPL(devm_iio_channel_release_all);
> -
>  static int iio_channel_read(struct iio_channel *chan, int *val, int *val2,
>  	enum iio_chan_info_enum info)
>  {
> diff --git a/include/linux/iio/consumer.h b/include/linux/iio/consumer.h
> index 2bde8c912d4d..c4118dcb8e05 100644
> --- a/include/linux/iio/consumer.h
> +++ b/include/linux/iio/consumer.h
> @@ -63,15 +63,6 @@ void iio_channel_release(struct iio_channel *chan);
>   */
>  struct iio_channel *devm_iio_channel_get(struct device *dev,
>  					 const char *consumer_channel);
> -/**
> - * devm_iio_channel_release() - Resource managed version of
> - *				iio_channel_release().
> - * @dev:		Pointer to consumer device for which resource
> - *			is allocared.
> - * @chan:		The channel to be released.
> - */
> -void devm_iio_channel_release(struct device *dev, struct iio_channel *chan);
> -
>  /**
>   * iio_channel_get_all() - get all channels associated with a client
>   * @dev:		Pointer to consumer device.
> @@ -106,15 +97,6 @@ void iio_channel_release_all(struct iio_channel *chan);
>   */
>  struct iio_channel *devm_iio_channel_get_all(struct device *dev);
>  
> -/**
> - * devm_iio_channel_release_all() - Resource managed version of
> - *				    iio_channel_release_all().
> - * @dev:		Pointer to consumer device for which resource
> - *			is allocared.
> - * @chan:		Array channel to be released.
> - */
> -void devm_iio_channel_release_all(struct device *dev, struct iio_channel *chan);
> -
>  struct iio_cb_buffer;
>  /**
>   * iio_channel_get_all_cb() - register callback for triggered capture