Unverified Commit d4e91adf authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Mark Brown
Browse files

ASoC: soc-dai: add snd_soc_dai_prepare() and use it internally 



Add a new snd_soc_dai_prepare() which can be used (in an upcoming patch)
by soc-dapm.c. Use this new function internally in
snd_soc_pcm_dai_prepare() to avoid duplicating code.

Suggested-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Reviewed-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/20250114215617.336105-2-martin.blumenstingl@googlemail.com


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

include/sound/soc-dai.h

+3 −0
Original line number Diff line number Diff line
@@ -193,6 +193,9 @@ int snd_soc_dai_set_channel_map(struct snd_soc_dai *dai, 


int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate);



int snd_soc_dai_prepare(struct snd_soc_dai *dai,

			struct snd_pcm_substream *substream);



/* Digital Audio Interface mute */

int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute,

			     int direction);

sound/soc/soc-dai.c

+19 −8
Original line number Diff line number Diff line
@@ -360,6 +360,22 @@ int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate) 
}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_tristate);



int snd_soc_dai_prepare(struct snd_soc_dai *dai,

			struct snd_pcm_substream *substream)

{

	int ret = 0;



	if (!snd_soc_dai_stream_valid(dai, substream->stream))

		return 0;



	if (dai->driver->ops &&

	    dai->driver->ops->prepare)

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



	return soc_dai_ret(dai, ret);

}

EXPORT_SYMBOL_GPL(snd_soc_dai_prepare);



/**

 * snd_soc_dai_digital_mute - configure DAI system or master clock.

 * @dai: DAI
@@ -577,14 +593,9 @@ int snd_soc_pcm_dai_prepare(struct snd_pcm_substream *substream) 
	int i, ret;



	for_each_rtd_dais(rtd, i, dai) {

		if (!snd_soc_dai_stream_valid(dai, substream->stream))

			continue;

		if (dai->driver->ops &&

		    dai->driver->ops->prepare) {

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

		ret = snd_soc_dai_prepare(dai, substream);

		if (ret < 0)

				return soc_dai_ret(dai, ret);

		}

			return ret;

	}



	return 0;