Unverified Commit 0035e256 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-component: add snd_soc_pcm_component_pointer() 



Current ALSA SoC is directly using component->driver->ops->xxx,
thus, the code nested deeply, and it makes code difficult to read,
and is not good for encapsulation.

We want to implement component related function at soc-component.c,
but, some of them need to care whole snd_soc_pcm_runtime (= rtd)
connected component.

Let's call component related function which need to care with
for_each_rtdcom() loop as snd_soc_pcm_component_xxx().
This patch adds new snd_soc_pcm_component_pointer() and use it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87sgqt4d0j.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-component.h

+2 −0
Original line number Diff line number Diff line
@@ -371,4 +371,6 @@ int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component, 
					struct of_phandle_args *args,

					const char **dai_name);



int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream);



#endif /* __SOC_COMPONENT_H */

sound/soc/soc-component.c

+18 −0
Original line number Diff line number Diff line
@@ -424,3 +424,21 @@ int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component, 
						     args, dai_name);

	return -ENOTSUPP;

}



int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_component *component;

	struct snd_soc_rtdcom_list *rtdcom;



	for_each_rtdcom(rtd, rtdcom) {

		component = rtdcom->component;



		/* FIXME: use 1st pointer */

		if (component->driver->ops &&

		    component->driver->ops->pointer)

			return component->driver->ops->pointer(substream);

	}



	return 0;

}

sound/soc/soc-pcm.c

+1 −12
Original line number Diff line number Diff line
@@ -1111,8 +1111,6 @@ static int soc_pcm_bespoke_trigger(struct snd_pcm_substream *substream, 
static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_component *component;

	struct snd_soc_rtdcom_list *rtdcom;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai;

	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -1124,17 +1122,8 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream) 
	/* clearing the previous total delay */

	runtime->delay = 0;



	for_each_rtdcom(rtd, rtdcom) {

		component = rtdcom->component;

	offset = snd_soc_pcm_component_pointer(substream);



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

		    !component->driver->ops->pointer)

			continue;



		/* FIXME: use 1st pointer */

		offset = component->driver->ops->pointer(substream);

		break;

	}

	/* base delay if assigned in pointer callback */

	delay = runtime->delay;

CRA Git | Maintained and supported by SUSTech CRA and CCSE