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

ASoC: soc-dai: add snd_soc_dai_compr_start() 



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

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


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

include/sound/soc-dai.h

+3 −0
Original line number Diff line number Diff line
@@ -170,6 +170,9 @@ int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream, int cmd); 
int snd_soc_pcm_dai_bespoke_trigger(struct snd_pcm_substream *substream,

				    int cmd);



int snd_soc_dai_compr_startup(struct snd_soc_dai *dai,

			      struct snd_compr_stream *cstream);



struct snd_soc_dai_ops {

	/*

	 * DAI clocking configuration, all optional.

sound/soc/soc-compress.c

+6 −18
Original line number Diff line number Diff line
@@ -87,15 +87,9 @@ static int soc_compr_open(struct snd_compr_stream *cstream) 


	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);



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

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

		if (ret < 0) {

			dev_err(cpu_dai->dev,

				"Compress ASoC: can't open interface %s: %d\n",

				cpu_dai->name, ret);

	ret = snd_soc_dai_compr_startup(cpu_dai, cstream);

	if (ret < 0)

		goto out;

		}

	}



	ret = soc_compr_components_open(cstream, &component);

	if (ret < 0)
@@ -178,15 +172,9 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) 
		goto out;

	}



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

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

		if (ret < 0) {

			dev_err(cpu_dai->dev,

				"Compress ASoC: can't open interface %s: %d\n",

				cpu_dai->name, ret);

	ret = snd_soc_dai_compr_startup(cpu_dai, cstream);

	if (ret < 0)

		goto out;

		}

	}



	ret = soc_compr_components_open(cstream, &component);

	if (ret < 0)

sound/soc/soc-dai.c

+13 −0
Original line number Diff line number Diff line
@@ -504,3 +504,16 @@ int snd_soc_pcm_dai_bespoke_trigger(struct snd_pcm_substream *substream, 


	return 0;

}



int snd_soc_dai_compr_startup(struct snd_soc_dai *dai,

			      struct snd_compr_stream *cstream)

{

	int ret = 0;



	if (dai->driver->cops &&

	    dai->driver->cops->startup)

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



	return soc_dai_ret(dai, ret);

}

EXPORT_SYMBOL_GPL(snd_soc_dai_compr_startup);

CRA Git | Maintained and supported by SUSTech CRA and CCSE