ASoC: soc-component: move snd_soc_component_set_bias_level()

Current soc-dapm / soc-core are using a long way round to call
.set_bias_level.

	if (driver->set_bias_level)
		dapm->set_bias_level = ...;
	...
	if (dapm->set_bias_level)
		ret = dapm->set_bias_level(...);

We can directly call it via driver->set_bias_level.
One note here is that both Card and Component have dapm,
but, Card's dapm doesn't have dapm->component.
We need to check it.

This patch moves snd_soc_component_set_bias_level() to soc-component.c
and updates parameters.
dapm->set_bias_level is no longer needed

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87tvb94d0n.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 1f84f04e2670415c0201ad3d2ed7ac77d7b9c33b..2aaf12bbbed0471814eebf81d086d31c7394bc6c 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -285,6 +285,8 @@ void snd_soc_component_seq_notifier(struct snd_soc_component *component,
                                    enum snd_soc_dapm_type type, int subseq);
 int snd_soc_component_stream_event(struct snd_soc_component *component,
                                   int event);
+int snd_soc_component_set_bias_level(struct snd_soc_component *component,
+                                    enum snd_soc_bias_level level);
 
 #ifdef CONFIG_REGMAP
 void snd_soc_component_init_regmap(struct snd_soc_component *component,

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index c2f14a3358911162d7543ded5f85951896d5e741..2aa73d6dd7bea3f34a16e5eda7c8a43257198b8d 100644 (file)
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -670,9 +670,6 @@ struct snd_soc_dapm_context {
        enum snd_soc_bias_level target_bias_level;
        struct list_head list;
 
-       int (*set_bias_level)(struct snd_soc_dapm_context *dapm,
-                             enum snd_soc_bias_level level);
-
        struct snd_soc_dapm_wcache path_sink_cache;
        struct snd_soc_dapm_wcache path_source_cache;
 

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index f33dda8023ec9a1e2247cbef76d7c031ee56a2ef..cb63df6e46ebb46a2dc5eb663a724a48a4a0576f 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -68,6 +68,15 @@ int snd_soc_component_stream_event(struct snd_soc_component *component,
        return 0;
 }
 
+int snd_soc_component_set_bias_level(struct snd_soc_component *component,
+                                    enum snd_soc_bias_level level)
+{
+       if (component->driver->set_bias_level)
+               return component->driver->set_bias_level(component, level);
+
+       return 0;
+}
+
 int snd_soc_component_enable_pin(struct snd_soc_component *component,
                                 const char *pin)
 {

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 8cfbe5fb592116f0fd52ba601930aa4c1d34b845..0f75dac4bb264f41f8a4cff9bac8ad0981e96507 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2646,14 +2646,6 @@ int snd_soc_register_dai(struct snd_soc_component *component,
 }
 EXPORT_SYMBOL_GPL(snd_soc_register_dai);
 
-static int snd_soc_component_set_bias_level(struct snd_soc_dapm_context *dapm,
-                                       enum snd_soc_bias_level level)
-{
-       struct snd_soc_component *component = dapm->component;
-
-       return component->driver->set_bias_level(component, level);
-}
-
 static int snd_soc_component_initialize(struct snd_soc_component *component,
        const struct snd_soc_component_driver *driver, struct device *dev)
 {
@@ -2674,8 +2666,6 @@ static int snd_soc_component_initialize(struct snd_soc_component *component,
        dapm->bias_level = SND_SOC_BIAS_OFF;
        dapm->idle_bias_off = !driver->idle_bias_on;
        dapm->suspend_bias_off = driver->suspend_bias_off;
-       if (driver->set_bias_level)
-               dapm->set_bias_level = snd_soc_component_set_bias_level;
 
        INIT_LIST_HEAD(&component->dai_list);
        mutex_init(&component->io_mutex);

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 9288b2b43f98f5809d130a97cad4044b66fef646..d09bdca63c620895d62c686217901ffa1a5ce1ca 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -684,8 +684,8 @@ int snd_soc_dapm_force_bias_level(struct snd_soc_dapm_context *dapm,
 {
        int ret = 0;
 
-       if (dapm->set_bias_level)
-               ret = dapm->set_bias_level(dapm, level);
+       if (dapm->component)
+               ret = snd_soc_component_set_bias_level(dapm->component, level);
 
        if (ret == 0)
                dapm->bias_level = level;