iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: soc-dai: add snd_soc_dai_shutdown()

Browse Source 
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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87v9vuhn4b.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-07-22 10:33:39 +09:00 committed by Mark Brown
parent 5a52a04531
commit 330fcb5135
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/soc-dai.h
View File

@ -152,6 +152,8 @@ 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);
void snd_soc_dai_shutdown(struct snd_soc_dai *dai,
struct snd_pcm_substream *substream);
struct snd_soc_dai_ops {
/*

7
sound/soc/soc-dai.c
View File

@ -300,3 +300,10 @@ int snd_soc_dai_startup(struct snd_soc_dai *dai,
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);
}

7
sound/soc/soc-dapm.c
View File

@ -3893,9 +3893,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
snd_soc_dai_hw_free(source, &substream);
source->active--;
if (source->driver->ops->shutdown)
source->driver->ops->shutdown(&substream,
source);
snd_soc_dai_shutdown(source, &substream);
}
substream.stream = SNDRV_PCM_STREAM_PLAYBACK;
@ -3905,8 +3903,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
snd_soc_dai_hw_free(sink, &substream);
sink->active--;
if (sink->driver->ops->shutdown)
sink->driver->ops->shutdown(&substream, sink);
snd_soc_dai_shutdown(sink, &substream);
}
break;

18
sound/soc/soc-pcm.c
View File

@ -641,16 +641,13 @@ machine_err:
i = rtd->num_codecs;
codec_dai_err:
for_each_rtd_codec_dai_rollback(rtd, i, codec_dai) {
if (codec_dai->driver->ops->shutdown)
codec_dai->driver->ops->shutdown(substream, codec_dai);
}
for_each_rtd_codec_dai_rollback(rtd, i, codec_dai)
snd_soc_dai_shutdown(codec_dai, substream);
component_err:
soc_pcm_components_close(substream, component);
if (cpu_dai->driver->ops->shutdown)
cpu_dai->driver->ops->shutdown(substream, cpu_dai);
snd_soc_dai_shutdown(cpu_dai, substream);
out:
mutex_unlock(&rtd->pcm_mutex);
@ -728,13 +725,10 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
snd_soc_dai_digital_mute(cpu_dai, 1, substream->stream);
if (cpu_dai->driver->ops->shutdown)
cpu_dai->driver->ops->shutdown(substream, cpu_dai);
snd_soc_dai_shutdown(cpu_dai, substream);
for_each_rtd_codec_dai(rtd, i, codec_dai) {
if (codec_dai->driver->ops->shutdown)
codec_dai->driver->ops->shutdown(substream, codec_dai);
}
for_each_rtd_codec_dai(rtd, i, codec_dai)
snd_soc_dai_shutdown(codec_dai, substream);
if (rtd->dai_link->ops->shutdown)
rtd->dai_link->ops->shutdown(substream);