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

ASoC: soc-pcm: add soc_rtd_prepare() 



Add soc_rtd_prepare() to make the code easier to read

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/875zh4mi9v.wl-kuninori.morimoto.gx@renesas.com


Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0be429f9

sound/soc/soc-pcm.c

+14 −7
Original line number Diff line number Diff line
@@ -45,6 +45,15 @@ static void soc_rtd_shutdown(struct snd_soc_pcm_runtime *rtd, 
		rtd->dai_link->ops->shutdown(substream);

}



static int soc_rtd_prepare(struct snd_soc_pcm_runtime *rtd,

			   struct snd_pcm_substream *substream)

{

	if (rtd->dai_link->ops &&

	    rtd->dai_link->ops->prepare)

		return rtd->dai_link->ops->prepare(substream);

	return 0;

}



/**

 * snd_soc_runtime_activate() - Increment active count for PCM runtime components

 * @rtd: ASoC PCM runtime that is activated
@@ -716,14 +725,12 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) 


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



	if (rtd->dai_link->ops->prepare) {

		ret = rtd->dai_link->ops->prepare(substream);

	ret = soc_rtd_prepare(rtd, substream);

	if (ret < 0) {

			dev_err(rtd->card->dev, "ASoC: machine prepare error:"

				" %d\n", ret);

		dev_err(rtd->card->dev,

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

		goto out;

	}

	}



	for_each_rtd_components(rtd, i, component) {

		ret = snd_soc_component_prepare(component, substream);

CRA Git | Maintained and supported by SUSTech CRA and CCSE