hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: soc-pcm: add soc_rtd_shutdown() 

Add soc_rtd_shutdown() to make the code easier to read

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/877e1kmi9z.wl-kuninori.morimoto.gx@renesas.com
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2020-01-22 09:44:40 +09:00 committed by Mark Brown
parent f183f9277a
commit 0be429f9fc
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,14 @@ static int soc_rtd_startup(struct snd_soc_pcm_runtime *rtd,
return 0; return 0;
} }
static void soc_rtd_shutdown(struct snd_soc_pcm_runtime *rtd,
struct snd_pcm_substream *substream)
{
if (rtd->dai_link->ops &&
rtd->dai_link->ops->shutdown)
rtd->dai_link->ops->shutdown(substream);
}
/** /**
* snd_soc_runtime_activate() - Increment active count for PCM runtime components * snd_soc_runtime_activate() - Increment active count for PCM runtime components
* @rtd: ASoC PCM runtime that is activated * @rtd: ASoC PCM runtime that is activated
@ -602,8 +610,7 @@ dynamic:
return 0; return 0;
config_err: config_err:
if (rtd->dai_link->ops->shutdown) soc_rtd_shutdown(rtd, substream);
rtd->dai_link->ops->shutdown(substream);
machine_err: machine_err:
i = rtd->num_codecs; i = rtd->num_codecs;
@ -674,8 +681,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
for_each_rtd_codec_dai(rtd, i, codec_dai) for_each_rtd_codec_dai(rtd, i, codec_dai)
snd_soc_dai_shutdown(codec_dai, substream); snd_soc_dai_shutdown(codec_dai, substream);
if (rtd->dai_link->ops->shutdown) soc_rtd_shutdown(rtd, substream);
rtd->dai_link->ops->shutdown(substream);
soc_pcm_components_close(substream, NULL); soc_pcm_components_close(substream, NULL);