ASoC: soc-component: add snd_soc_component_probe()

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/8736it5rlt.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 9600dc4..34e774e 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -356,5 +356,6 @@ int snd_soc_component_trigger(struct snd_soc_component *component,
 void snd_soc_component_suspend(struct snd_soc_component *component);
 void snd_soc_component_resume(struct snd_soc_component *component);
 int snd_soc_component_is_suspended(struct snd_soc_component *component);
+int snd_soc_component_probe(struct snd_soc_component *component);
 
 #endif /* __SOC_COMPONENT_H */

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index 0a9ca84..b2bfc03 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -366,3 +366,11 @@ int snd_soc_component_is_suspended(struct snd_soc_component *component)
 {
        return component->suspended;
 }
+
+int snd_soc_component_probe(struct snd_soc_component *component)
+{
+       if (component->driver->probe)
+               return component->driver->probe(component);
+
+       return 0;
+}

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index ea93edd..6a422dd 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1282,13 +1282,11 @@ static int soc_probe_component(struct snd_soc_card *card,
                }
        }
 
-       if (component->driver->probe) {
-               ret = component->driver->probe(component);
-               if (ret < 0) {
-                       dev_err(component->dev,
-                               "ASoC: failed to probe component %d\n", ret);
-                       goto err_probe;
-               }
+       ret = snd_soc_component_probe(component);
+       if (ret < 0) {
+               dev_err(component->dev,
+                       "ASoC: failed to probe component %d\n", ret);
+               goto err_probe;
        }
        WARN(dapm->idle_bias_off &&
             dapm->bias_level != SND_SOC_BIAS_OFF,