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

ASoC: soc-dai: add snd_soc_dai_startup() 



Current ALSA SoC is directly using dai->driver->ops->xxx,
thus, it has deep nested bracket, and it makes code unreadable.
This patch adds new snd_soc_dai_startup() and use it.

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


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

include/sound/soc-dai.h

+2 −0
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ int snd_soc_dai_hw_params(struct snd_soc_dai *dai, 
			  struct snd_pcm_hw_params *params);

void snd_soc_dai_hw_free(struct snd_soc_dai *dai,

			 struct snd_pcm_substream *substream);

int snd_soc_dai_startup(struct snd_soc_dai *dai,

			struct snd_pcm_substream *substream);



struct snd_soc_dai_ops {

	/*

sound/soc/soc-dai.c

+11 −0
Original line number Diff line number Diff line
@@ -289,3 +289,14 @@ void snd_soc_dai_hw_free(struct snd_soc_dai *dai, 
	if (dai->driver->ops->hw_free)

		dai->driver->ops->hw_free(substream, dai);

}



int snd_soc_dai_startup(struct snd_soc_dai *dai,

			struct snd_pcm_substream *substream)

{

	int ret = 0;



	if (dai->driver->ops->startup)

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



	return ret;

}

sound/soc/soc-dapm.c

+10 −18
Original line number Diff line number Diff line
@@ -3828,16 +3828,12 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, 
		snd_soc_dapm_widget_for_each_source_path(w, path) {

			source = path->source->priv;



			if (source->driver->ops->startup) {

				ret = source->driver->ops->startup(&substream,

								   source);

			ret = snd_soc_dai_startup(source, &substream);

			if (ret < 0) {

				dev_err(source->dev,

						"ASoC: startup() failed: %d\n",

						ret);

					"ASoC: startup() failed: %d\n", ret);

				goto out;

			}

			}

			source->active++;

			ret = snd_soc_dai_hw_params(source, &substream, params);

			if (ret < 0)
@@ -3850,16 +3846,12 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, 
		snd_soc_dapm_widget_for_each_sink_path(w, path) {

			sink = path->sink->priv;



			if (sink->driver->ops->startup) {

				ret = sink->driver->ops->startup(&substream,

								 sink);

			ret = snd_soc_dai_startup(sink, &substream);

			if (ret < 0) {

				dev_err(sink->dev,

						"ASoC: startup() failed: %d\n",

						ret);

					"ASoC: startup() failed: %d\n", ret);

				goto out;

			}

			}

			sink->active++;

			ret = snd_soc_dai_hw_params(sink, &substream, params);

			if (ret < 0)

sound/soc/soc-pcm.c

+11 −16
Original line number Diff line number Diff line
@@ -535,30 +535,25 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) 
	mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);



	/* startup the audio subsystem */

	if (cpu_dai->driver->ops->startup) {

		ret = cpu_dai->driver->ops->startup(substream, cpu_dai);

	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);

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

			cpu_dai->name, ret);

		goto out;

	}

	}



	ret = soc_pcm_components_open(substream, &component);

	if (ret < 0)

		goto component_err;



	for_each_rtd_codec_dai(rtd, i, codec_dai) {

		if (codec_dai->driver->ops->startup) {

			ret = codec_dai->driver->ops->startup(substream,

							      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;

		}

		}



		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)

			codec_dai->tx_mask = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE