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

ASoC: soc-dai: add snd_soc_pcm_dai_prepare() 



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_prepare() to
snd_soc_pcm_dai_prepare(). 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/87wo65ssk2.wl-kuninori.morimoto.gx@renesas.com


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

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_prepare(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,
@@ -171,6 +169,7 @@ int snd_soc_dai_compress_new(struct snd_soc_dai *dai, 
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);



struct snd_soc_dai_ops {

	/*

sound/soc/soc-dai.c

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

}



int snd_soc_dai_prepare(struct snd_soc_dai *dai,

			struct snd_pcm_substream *substream)

{

	int ret = 0;



	if (dai->driver->ops &&

	    dai->driver->ops->prepare)

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



	return soc_dai_ret(dai, ret);

}



int snd_soc_dai_trigger(struct snd_soc_dai *dai,

			struct snd_pcm_substream *substream,

			int cmd)
@@ -461,3 +449,21 @@ int snd_soc_pcm_dai_new(struct snd_soc_pcm_runtime *rtd) 


	return 0;

}



int snd_soc_pcm_dai_prepare(struct snd_pcm_substream *substream)

{

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

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

			if (ret < 0)

				return soc_dai_ret(dai, ret);

		}

	}



	return 0;

}

sound/soc/soc-pcm.c

+4 −7
Original line number Diff line number Diff line
@@ -950,14 +950,11 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) 
		}

	}



	for_each_rtd_dais(rtd, i, dai) {

		ret = snd_soc_dai_prepare(dai, substream);

	ret = snd_soc_pcm_dai_prepare(substream);

	if (ret < 0) {

			dev_err(dai->dev,

				"ASoC: DAI prepare error: %d\n", ret);

		dev_err(rtd->dev, "ASoC: DAI prepare error: %d\n", ret);

		goto out;

	}

	}



	/* cancel any delayed stream shutdown that is pending */

	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE