ASoC: soc-dai: add snd_soc_dai_resume()

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_resume() and use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87lfwqhn2j.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 6c5604a7dbc225a37ba38b887ad818713221de75..ed78e34a814e94ad360ec7f8aa60b758126ebe88 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -163,6 +163,7 @@ int snd_soc_dai_bespoke_trigger(struct snd_soc_dai *dai,
 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);
+void snd_soc_dai_resume(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 7493afb2371ce6f5b52b30bfb84bad75e28df951..5c02f90cea691a69baa5facb8b167a0f187736e8 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -631,8 +631,8 @@ static void soc_resume_deferred(struct work_struct *work)
                if (rtd->dai_link->ignore_suspend)
                        continue;
 
-               if (cpu_dai->driver->resume && cpu_dai->driver->bus_control)
-                       cpu_dai->driver->resume(cpu_dai);
+               if (cpu_dai->driver->bus_control)
+                       snd_soc_dai_resume(cpu_dai);
        }
 
        for_each_card_components(card, component) {
@@ -678,8 +678,8 @@ static void soc_resume_deferred(struct work_struct *work)
                if (rtd->dai_link->ignore_suspend)
                        continue;
 
-               if (cpu_dai->driver->resume && !cpu_dai->driver->bus_control)
-                       cpu_dai->driver->resume(cpu_dai);
+               if (!cpu_dai->driver->bus_control)
+                       snd_soc_dai_resume(cpu_dai);
        }
 
        if (card->resume_post)

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 3373598e06826471d4fda4b98d8e0489286b9694..ddb6f217c0ed1eb376f97e826bb88cb2a3326eed 100644 (file)
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -359,3 +359,9 @@ void snd_soc_dai_suspend(struct snd_soc_dai *dai)
        if (dai->driver->suspend)
                dai->driver->suspend(dai);
 }
+
+void snd_soc_dai_resume(struct snd_soc_dai *dai)
+{
+       if (dai->driver->resume)
+               dai->driver->resume(dai);
+}