ASoC: soc-component: add snd_soc_component_resume()

Current ALSA SoC is directly using component->driver->xxx,
thus, it is deep nested, and makes code difficult to read,
and is not good for encapsulation.
This patch adds new snd_soc_component_resume() and use it.

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

diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index cdb014f41fd1844734ba23685d3168eafc4f6fc1..1e3b70855ba71ec2dafee830aced7ab0c97bce8e 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -354,5 +354,6 @@ int snd_soc_component_trigger(struct snd_soc_component *component,
                              struct snd_pcm_substream *substream,
                              int cmd);
 void snd_soc_component_suspend(struct snd_soc_component *component);
+void snd_soc_component_resume(struct snd_soc_component *component);
 
 #endif /* __SOC_COMPONENT_H */

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index f0e63cd991c85c5b22592ac95a48f91a00c18542..cbae7672b72d33ac7a5c00d2fd058846ffd8fd06 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -354,3 +354,10 @@ void snd_soc_component_suspend(struct snd_soc_component *component)
                component->driver->suspend(component);
        component->suspended = 1;
 }
+
+void snd_soc_component_resume(struct snd_soc_component *component)
+{
+       if (component->driver->resume)
+               component->driver->resume(component);
+       component->suspended = 0;
+}

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 855b19abc1d20799271e71881055dd25dbb7afd4..6cdfe7b2fe068d52152618ca87e5a727aa31b791 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -593,9 +593,7 @@ static void soc_resume_deferred(struct work_struct *work)
 
        for_each_card_components(card, component) {
                if (component->suspended) {
-                       if (component->driver->resume)
-                               component->driver->resume(component);
-                       component->suspended = 0;
+                       snd_soc_component_resume(component);
                }
        }