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

ASoC: soc-pcm: tidyup soc_pcm_open() order 



soc_pcm_open() operation order is not good.
At first, soc_pcm_open() operation order is

	1) CPU DAI startup
	2) Component open
	3) Codec DAI startup
	4) rtd startup

But here, 2) will call try_module_get() if component has
module_get_upon_open flags. This means 1) CPU DAI startup
will be operated *before* its module was loaded.
DAI should be called *after* Component.

Second, soc_pcm_close() operation order is
	1) CPU DAI shutdown
	2) Codec DAI shutdown
	3) rtd shutdown
	4) Component close

soc_pcm_open() and soc_pcm_close() are paired function,
but, its operation order is unbalance.
This patch tidyup soc_pcm_open() order to Component -> rtd -> DAI.
This is one of prepare for cleanup soc-pcm-open()

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


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

sound/soc/soc-pcm.c

+16 −18
Original line number Diff line number Diff line
@@ -574,25 +574,32 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) 


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



	ret = soc_pcm_components_open(substream);

	if (ret < 0)

		goto component_err;



	ret = soc_rtd_startup(rtd, substream);

	if (ret < 0) {

		pr_err("ASoC: %s startup failed: %d\n",

		       rtd->dai_link->name, ret);

		goto component_err;

	}



	/* startup the audio subsystem */

	ret = snd_soc_dai_startup(cpu_dai, substream);

	if (ret < 0) {

		dev_err(cpu_dai->dev, "ASoC: can't open interface %s: %d\n",

			cpu_dai->name, ret);

		goto out;

		goto cpu_dai_err;

	}



	ret = soc_pcm_components_open(substream);

	if (ret < 0)

		goto component_err;



	for_each_rtd_codec_dai(rtd, i, codec_dai) {

		ret = snd_soc_dai_startup(codec_dai, substream);

		if (ret < 0) {

			dev_err(codec_dai->dev,

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

				codec_dai->name, ret);

			goto codec_dai_err;

			goto config_err;

		}



		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
@@ -601,13 +608,6 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) 
			codec_dai->rx_mask = 0;

	}



	ret = soc_rtd_startup(rtd, substream);

	if (ret < 0) {

		pr_err("ASoC: %s startup failed: %d\n",

		       rtd->dai_link->name, ret);

		goto codec_dai_err;

	}



	/* Dynamic PCM DAI links compat checks use dynamic capabilities */

	if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm)

		goto dynamic;
@@ -672,17 +672,15 @@ dynamic: 
	return 0;



config_err:

	soc_rtd_shutdown(rtd, substream);



codec_dai_err:

	for_each_rtd_codec_dai(rtd, i, codec_dai)

		snd_soc_dai_shutdown(codec_dai, substream);

cpu_dai_err:

	snd_soc_dai_shutdown(cpu_dai, substream);



	soc_rtd_shutdown(rtd, substream);

component_err:

	soc_pcm_components_close(substream);



	snd_soc_dai_shutdown(cpu_dai, substream);

out:

	mutex_unlock(&rtd->card->pcm_mutex);



	for_each_rtd_components(rtd, i, component) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE