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

ASoC: soc-dai: add snd_soc_dai_compr_trigger() 



dai related function should be implemented at soc-dai.c.
This patch adds snd_soc_dai_compr_trigger().

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


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

include/sound/soc-dai.h

+2 −0
Original line number Diff line number Diff line
@@ -174,6 +174,8 @@ int snd_soc_dai_compr_startup(struct snd_soc_dai *dai, 
			      struct snd_compr_stream *cstream);

void snd_soc_dai_compr_shutdown(struct snd_soc_dai *dai,

				struct snd_compr_stream *cstream);

int snd_soc_dai_compr_trigger(struct snd_soc_dai *dai,

			      struct snd_compr_stream *cstream, int cmd);



struct snd_soc_dai_ops {

	/*

sound/soc/soc-compress.c

+6 −7
Original line number Diff line number Diff line
@@ -338,8 +338,9 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd) 
	if (ret < 0)

		goto out;



	if (cpu_dai->driver->cops && cpu_dai->driver->cops->trigger)

		cpu_dai->driver->cops->trigger(cstream, cmd, cpu_dai);

	ret = snd_soc_dai_compr_trigger(cpu_dai, cstream, cmd);

	if (ret < 0)

		goto out;



	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:
@@ -372,11 +373,9 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd) 


	mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);



	if (cpu_dai->driver->cops && cpu_dai->driver->cops->trigger) {

		ret = cpu_dai->driver->cops->trigger(cstream, cmd, cpu_dai);

	ret = snd_soc_dai_compr_trigger(cpu_dai, cstream, cmd);

	if (ret < 0)

		goto out;

	}



	ret = soc_compr_components_trigger(cstream, cmd);

	if (ret < 0)

sound/soc/soc-dai.c

+13 −0
Original line number Diff line number Diff line
@@ -526,3 +526,16 @@ void snd_soc_dai_compr_shutdown(struct snd_soc_dai *dai, 
		dai->driver->cops->shutdown(cstream, dai);

}

EXPORT_SYMBOL_GPL(snd_soc_dai_compr_shutdown);



int snd_soc_dai_compr_trigger(struct snd_soc_dai *dai,

			      struct snd_compr_stream *cstream, int cmd)

{

	int ret = 0;



	if (dai->driver->cops &&

	    dai->driver->cops->trigger)

		ret = dai->driver->cops->trigger(cstream, cmd, dai);



	return soc_dai_ret(dai, ret);

}

EXPORT_SYMBOL_GPL(snd_soc_dai_compr_trigger);

CRA Git | Maintained and supported by SUSTech CRA and CCSE