[2/7] ASoC: soc-pcm: add soc_rtd_shutdown()
diff mbox series

Message ID 877e1kmi9z.wl-kuninori.morimoto.gx@renesas.com
State Accepted
Commit 0be429f9fcfccfbbbcdb40e154a5c2328da17ca9
Headers show
Series
  • ASoC: soc-pcm: add soc_rtd_xxx()
Related show

Commit Message

Kuninori Morimoto Jan. 22, 2020, 12:44 a.m. UTC
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Add soc_rtd_shutdown() to make the code easier to read

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/soc/soc-pcm.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

Patch
diff mbox series

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index c001829..8095c64 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -37,6 +37,14 @@  static int soc_rtd_startup(struct snd_soc_pcm_runtime *rtd,
 	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
  * @rtd: ASoC PCM runtime that is activated
@@ -602,8 +610,7 @@  static int soc_pcm_open(struct snd_pcm_substream *substream)
 	return 0;
 
 config_err:
-	if (rtd->dai_link->ops->shutdown)
-		rtd->dai_link->ops->shutdown(substream);
+	soc_rtd_shutdown(rtd, substream);
 
 machine_err:
 	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)
 		snd_soc_dai_shutdown(codec_dai, substream);
 
-	if (rtd->dai_link->ops->shutdown)
-		rtd->dai_link->ops->shutdown(substream);
+	soc_rtd_shutdown(rtd, substream);
 
 	soc_pcm_components_close(substream, NULL);