Unverified Commit 03ecea64 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-component: add snd_soc_component_compr_pointer() 



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

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/874klt7v65.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-component.h

+2 −0
Original line number Diff line number Diff line
@@ -458,6 +458,8 @@ int snd_soc_component_compr_get_caps(struct snd_compr_stream *cstream, 
int snd_soc_component_compr_get_codec_caps(struct snd_compr_stream *cstream,

					   struct snd_compr_codec_caps *codec);

int snd_soc_component_compr_ack(struct snd_compr_stream *cstream, size_t bytes);

int snd_soc_component_compr_pointer(struct snd_compr_stream *cstream,

				    struct snd_compr_tstamp *tstamp);



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

+20 −0
Original line number Diff line number Diff line
@@ -591,6 +591,26 @@ int snd_soc_component_compr_ack(struct snd_compr_stream *cstream, size_t bytes) 
}

EXPORT_SYMBOL_GPL(snd_soc_component_compr_ack);



int snd_soc_component_compr_pointer(struct snd_compr_stream *cstream,

				    struct snd_compr_tstamp *tstamp)

{

	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->pointer) {

			ret = component->driver->compress_ops->pointer(

				component, cstream, tstamp);

			return soc_component_ret(component, ret);

		}

	}



	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_component_compr_pointer);



static unsigned int soc_component_read_no_lock(

	struct snd_soc_component *component,

	unsigned int reg)

sound/soc/soc-compress.c

+2 −11
Original line number Diff line number Diff line
@@ -431,8 +431,7 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream, 
			     struct snd_compr_tstamp *tstamp)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_soc_component *component;

	int i, ret = 0;

	int ret;

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);



	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
@@ -441,15 +440,7 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream, 
	if (ret < 0)

		goto out;



	for_each_rtd_components(rtd, i, component) {

		if (!component->driver->compress_ops ||

		    !component->driver->compress_ops->pointer)

			continue;



		ret = component->driver->compress_ops->pointer(

			component, cstream, tstamp);

		break;

	}

	ret = snd_soc_component_compr_pointer(cstream, tstamp);

out:

	mutex_unlock(&rtd->card->pcm_mutex);

	return ret;