Commit 330fcb51 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-dai: add snd_soc_dai_shutdown()

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_shutdown() and use it.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87v9vuhn4b.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5a52a045
...@@ -152,6 +152,8 @@ void snd_soc_dai_hw_free(struct snd_soc_dai *dai, ...@@ -152,6 +152,8 @@ void snd_soc_dai_hw_free(struct snd_soc_dai *dai,
struct snd_pcm_substream *substream); struct snd_pcm_substream *substream);
int snd_soc_dai_startup(struct snd_soc_dai *dai, int snd_soc_dai_startup(struct snd_soc_dai *dai,
struct snd_pcm_substream *substream); struct snd_pcm_substream *substream);
void snd_soc_dai_shutdown(struct snd_soc_dai *dai,
struct snd_pcm_substream *substream);
struct snd_soc_dai_ops { struct snd_soc_dai_ops {
/* /*
......
...@@ -300,3 +300,10 @@ int snd_soc_dai_startup(struct snd_soc_dai *dai, ...@@ -300,3 +300,10 @@ int snd_soc_dai_startup(struct snd_soc_dai *dai,
return ret; return ret;
} }
void snd_soc_dai_shutdown(struct snd_soc_dai *dai,
struct snd_pcm_substream *substream)
{
if (dai->driver->ops->shutdown)
dai->driver->ops->shutdown(substream, dai);
}
...@@ -3893,9 +3893,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, ...@@ -3893,9 +3893,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
snd_soc_dai_hw_free(source, &substream); snd_soc_dai_hw_free(source, &substream);
source->active--; source->active--;
if (source->driver->ops->shutdown) snd_soc_dai_shutdown(source, &substream);
source->driver->ops->shutdown(&substream,
source);
} }
substream.stream = SNDRV_PCM_STREAM_PLAYBACK; substream.stream = SNDRV_PCM_STREAM_PLAYBACK;
...@@ -3905,8 +3903,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, ...@@ -3905,8 +3903,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
snd_soc_dai_hw_free(sink, &substream); snd_soc_dai_hw_free(sink, &substream);
sink->active--; sink->active--;
if (sink->driver->ops->shutdown) snd_soc_dai_shutdown(sink, &substream);
sink->driver->ops->shutdown(&substream, sink);
} }
break; break;
......
...@@ -641,16 +641,13 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) ...@@ -641,16 +641,13 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
i = rtd->num_codecs; i = rtd->num_codecs;
codec_dai_err: codec_dai_err:
for_each_rtd_codec_dai_rollback(rtd, i, codec_dai) { for_each_rtd_codec_dai_rollback(rtd, i, codec_dai)
if (codec_dai->driver->ops->shutdown) snd_soc_dai_shutdown(codec_dai, substream);
codec_dai->driver->ops->shutdown(substream, codec_dai);
}
component_err: component_err:
soc_pcm_components_close(substream, component); soc_pcm_components_close(substream, component);
if (cpu_dai->driver->ops->shutdown) snd_soc_dai_shutdown(cpu_dai, substream);
cpu_dai->driver->ops->shutdown(substream, cpu_dai);
out: out:
mutex_unlock(&rtd->pcm_mutex); mutex_unlock(&rtd->pcm_mutex);
...@@ -728,13 +725,10 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) ...@@ -728,13 +725,10 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
snd_soc_dai_digital_mute(cpu_dai, 1, substream->stream); snd_soc_dai_digital_mute(cpu_dai, 1, substream->stream);
if (cpu_dai->driver->ops->shutdown) snd_soc_dai_shutdown(cpu_dai, substream);
cpu_dai->driver->ops->shutdown(substream, cpu_dai);
for_each_rtd_codec_dai(rtd, i, codec_dai) { for_each_rtd_codec_dai(rtd, i, codec_dai)
if (codec_dai->driver->ops->shutdown) snd_soc_dai_shutdown(codec_dai, substream);
codec_dai->driver->ops->shutdown(substream, codec_dai);
}
if (rtd->dai_link->ops->shutdown) if (rtd->dai_link->ops->shutdown)
rtd->dai_link->ops->shutdown(substream); rtd->dai_link->ops->shutdown(substream);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment