Unverified Commit 42f2472d authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-dai: add snd_soc_pcm_dai_trigger() 



We have 2 type of component functions
snd_soc_dai_xxx()     is focusing to dai itself,
snd_soc_pcm_dai_xxx() is focusing to rtd related dai.

Now we can update snd_soc_dai_trigger() to
snd_soc_pcm_dai_trigger(). This patch do it.

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


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

include/sound/soc-dai.h

+1 −2
Original line number Diff line number Diff line
@@ -154,8 +154,6 @@ int snd_soc_dai_startup(struct snd_soc_dai *dai, 
			struct snd_pcm_substream *substream);

void snd_soc_dai_shutdown(struct snd_soc_dai *dai,

			  struct snd_pcm_substream *substream);

int snd_soc_dai_trigger(struct snd_soc_dai *dai,

			struct snd_pcm_substream *substream, int cmd);

int snd_soc_dai_bespoke_trigger(struct snd_soc_dai *dai,

			struct snd_pcm_substream *substream, int cmd);

snd_pcm_sframes_t snd_soc_dai_delay(struct snd_soc_dai *dai,
@@ -170,6 +168,7 @@ bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream); 


int snd_soc_pcm_dai_new(struct snd_soc_pcm_runtime *rtd);

int snd_soc_pcm_dai_prepare(struct snd_pcm_substream *substream);

int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream, int cmd);



struct snd_soc_dai_ops {

	/*

sound/soc/soc-dai.c

+19 −13
Original line number Diff line number Diff line
@@ -354,19 +354,6 @@ void snd_soc_dai_shutdown(struct snd_soc_dai *dai, 
		dai->driver->ops->shutdown(substream, dai);

}



int snd_soc_dai_trigger(struct snd_soc_dai *dai,

			struct snd_pcm_substream *substream,

			int cmd)

{

	int ret = 0;



	if (dai->driver->ops &&

	    dai->driver->ops->trigger)

		ret = dai->driver->ops->trigger(substream, cmd, dai);



	return ret;

}



int snd_soc_dai_bespoke_trigger(struct snd_soc_dai *dai,

				struct snd_pcm_substream *substream,

				int cmd)
@@ -467,3 +454,22 @@ int snd_soc_pcm_dai_prepare(struct snd_pcm_substream *substream) 


	return 0;

}



int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream,

			    int cmd)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *dai;

	int i, ret;



	for_each_rtd_dais(rtd, i, dai) {

		if (dai->driver->ops &&

		    dai->driver->ops->trigger) {

			ret = dai->driver->ops->trigger(substream, cmd, dai);

			if (ret < 0)

				return soc_dai_ret(dai, ret);

		}

	}



	return 0;

}

sound/soc/soc-pcm.c

+4 −14
Original line number Diff line number Diff line
@@ -1192,7 +1192,6 @@ static int soc_pcm_trigger_start(struct snd_pcm_substream *substream, int cmd) 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_component *component;

	struct snd_soc_dai *dai;

	int i, ret;



	ret = soc_rtd_trigger(rtd, substream, cmd);
@@ -1205,27 +1204,18 @@ static int soc_pcm_trigger_start(struct snd_pcm_substream *substream, int cmd) 
			return ret;

	}



	for_each_rtd_dais(rtd, i, dai) {

		ret = snd_soc_dai_trigger(dai, substream, cmd);

		if (ret < 0)

			return ret;

	}



	return 0;

	return snd_soc_pcm_dai_trigger(substream, cmd);

}



static int soc_pcm_trigger_stop(struct snd_pcm_substream *substream, int cmd)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_component *component;

	struct snd_soc_dai *dai;

	int i, ret;



	for_each_rtd_dais(rtd, i, dai) {

		ret = snd_soc_dai_trigger(dai, substream, cmd);

	ret = snd_soc_pcm_dai_trigger(substream, cmd);

	if (ret < 0)

		return ret;

	}



	for_each_rtd_components(rtd, i, component) {

		ret = snd_soc_component_trigger(component, substream, cmd);

CRA Git | Maintained and supported by SUSTech CRA and CCSE