Unverified Commit 1b308fb1 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-component: add snd_soc_component_compr_set_metadata() 



component related function should be implemented at
soc-component.c.
This patch adds snd_soc_component_compr_set_metadata().

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/871rgx7v5t.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b5852e66

include/sound/soc-component.h

+2 −0
Original line number Diff line number Diff line
@@ -462,6 +462,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,

sound/soc/soc-component.c

+21 −0
Original line number Diff line number Diff line
@@ -635,6 +635,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);



static unsigned int soc_component_read_no_lock(

	struct snd_soc_component *component,

	unsigned int reg)

sound/soc/soc-compress.c

+2 −14
Original line number Diff line number Diff line
@@ -450,26 +450,14 @@ 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;

	}



	return 0;

	return snd_soc_component_compr_set_metadata(cstream, metadata);

}



static int soc_compr_get_metadata(struct snd_compr_stream *cstream,