ASoC: soc-dai: add snd_soc_dai_suspend()

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87muh6hn2x.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 7cfed3034511c45654d172d439c9c5a20d5e78cd..6c5604a7dbc225a37ba38b887ad818713221de75 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -162,6 +162,7 @@ int snd_soc_dai_bespoke_trigger(struct snd_soc_dai *dai,
                        struct snd_pcm_substream *substream, int cmd);
 snd_pcm_sframes_t snd_soc_dai_delay(struct snd_soc_dai *dai,
                                    struct snd_pcm_substream *substream);
+void snd_soc_dai_suspend(struct snd_soc_dai *dai);
 
 struct snd_soc_dai_ops {
        /*

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6e8c5c8eeaec3f200903c31d0cb50da632be2c30..7493afb2371ce6f5b52b30bfb84bad75e28df951 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -511,8 +511,8 @@ int snd_soc_suspend(struct device *dev)
                if (rtd->dai_link->ignore_suspend)
                        continue;
 
-               if (cpu_dai->driver->suspend && !cpu_dai->driver->bus_control)
-                       cpu_dai->driver->suspend(cpu_dai);
+               if (!cpu_dai->driver->bus_control)
+                       snd_soc_dai_suspend(cpu_dai);
        }
 
        /* close any waiting streams */
@@ -584,8 +584,8 @@ int snd_soc_suspend(struct device *dev)
                if (rtd->dai_link->ignore_suspend)
                        continue;
 
-               if (cpu_dai->driver->suspend && cpu_dai->driver->bus_control)
-                       cpu_dai->driver->suspend(cpu_dai);
+               if (cpu_dai->driver->bus_control)
+                       snd_soc_dai_suspend(cpu_dai);
 
                /* deactivate pins to sleep state */
                pinctrl_pm_select_sleep_state(cpu_dai->dev);

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 5b5b979cd1f35f536da14267a45abca1e7883512..3373598e06826471d4fda4b98d8e0489286b9694 100644 (file)
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -353,3 +353,9 @@ snd_pcm_sframes_t snd_soc_dai_delay(struct snd_soc_dai *dai,
 
        return delay;
 }
+
+void snd_soc_dai_suspend(struct snd_soc_dai *dai)
+{
+       if (dai->driver->suspend)
+               dai->driver->suspend(dai);
+}