[PATCH 19/24] ASoC: soc-component: add snd_soc_component_compr_set_metadata()

[Ranjani Sridharan]

On Mon, 2020-06-01 at 10:37 +0900, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
> 
> component related function should be implemented at
> soc-component.c.
> This patch adds snd_soc_component_compr_set_metadata().
> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
> ---
>  include/sound/soc-component.h |  2 ++
>  sound/soc/soc-component.c     | 21 +++++++++++++++++++++
>  sound/soc/soc-compress.c      | 16 +++-------------
>  3 files changed, 26 insertions(+), 13 deletions(-)
> 
> diff --git a/include/sound/soc-component.h b/include/sound/soc-
> component.h
> index 255014fe6264..ce1df96bb274 100644
> --- a/include/sound/soc-component.h
> +++ b/include/sound/soc-component.h
> @@ -454,6 +454,8 @@ int snd_soc_component_compr_pointer(struct
> snd_compr_stream *cstream,
>  				    struct snd_compr_tstamp *tstamp);
>  int snd_soc_component_compr_copy(struct snd_compr_stream *cstream,
>  				 char __user *buf, size_t count);
> +int snd_soc_component_compr_set_metadata(struct snd_compr_stream
> *cstream,
> +					 struct snd_compr_metadata
> *metadata);
>  
>  int snd_soc_pcm_component_pointer(struct snd_pcm_substream
> *substream);
>  int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream,
> diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
> index 6a47255767a0..1ac353cf48c5 100644
> --- a/sound/soc/soc-component.c
> +++ b/sound/soc/soc-component.c
> @@ -591,6 +591,27 @@ int snd_soc_component_compr_copy(struct
> snd_compr_stream *cstream,
>  }
>  EXPORT_SYMBOL_GPL(snd_soc_component_compr_copy);
>  
> +int snd_soc_component_compr_set_metadata(struct snd_compr_stream
> *cstream,
> +					 struct snd_compr_metadata
> *metadata)
> +{
> +	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
> +	struct snd_soc_component *component;
> +	int i, ret;
> +
> +	for_each_rtd_components(rtd, i, component) {
> +		if (component->driver->compress_ops &&
> +		    component->driver->compress_ops->set_metadata) {
> +			ret = component->driver->compress_ops-
> >set_metadata(
> +				component, cstream, metadata);
> +			if (ret < 0)
> +				return soc_component_ret(component,
> ret);
> +		}
> +	}
> +
> +	return 0;
> +}
> +EXPORT_SYMBOL_GPL(snd_soc_component_compr_set_metadata);
> +
>  int snd_soc_pcm_component_pointer(struct snd_pcm_substream
> *substream)
>  {
>  	struct snd_soc_pcm_runtime *rtd = substream->private_data;
> diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
> index 7e05f263b655..62925adb1042 100644
> --- a/sound/soc/soc-compress.c
> +++ b/sound/soc/soc-compress.c
> @@ -530,26 +530,16 @@ static int soc_compr_set_metadata(struct
> snd_compr_stream *cstream,
>  				  struct snd_compr_metadata *metadata)
>  {
>  	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
> -	struct snd_soc_component *component;
>  	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
> -	int i, ret;
> +	int ret;
>  
>  	ret = snd_soc_dai_compr_set_metadata(cpu_dai, cstream,
> metadata);
>  	if (ret < 0)
>  		return ret;
>  
> -	for_each_rtd_components(rtd, i, component) {
> -		if (!component->driver->compress_ops ||
> -		    !component->driver->compress_ops->set_metadata)
> -			continue;
> -
> -		ret = component->driver->compress_ops->set_metadata(
> -			component, cstream, metadata);
> -		if (ret < 0)
> -			return ret;
> -	}
> +	ret = snd_soc_component_compr_set_metadata(cstream, metadata);
>  
> -	return 0;
> +	return ret;
maybe just,
return snd_soc_component_compr_set_metadata(cstream, metadata);?

Thanks,
Ranjani