ASoC: soc-component: unpack snd_soc_component_force_bias_level()

Because struct snd_soc_dapm_context is soc-dapm framework specific, user
driver don't need to access its member directly, we would like to hide
them. struct snd_soc_dapm_context will be removed from header in the
future.

This patch unpack component wrapper to cleanup it.

The function will be kept by using macro for a while, but will be
replaced/cleanuped in the future.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/871ppp83jk.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 2caa807c6249c4d7c7fb16b95c6deab665d54159..c616f489c2379410fa5ffb215c397246a42ffd37 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -314,23 +314,6 @@ snd_soc_component_get_bias_level(struct snd_soc_component *component)
                snd_soc_component_get_dapm(component));
 }
 
-/**
- * snd_soc_component_force_bias_level() - Set the COMPONENT DAPM bias level
- * @component: The COMPONENT for which to set the level
- * @level: The level to set to
- *
- * Forces the COMPONENT bias level to a specific state. See
- * snd_soc_dapm_force_bias_level().
- */
-static inline int
-snd_soc_component_force_bias_level(struct snd_soc_component *component,
-                                  enum snd_soc_bias_level level)
-{
-       return snd_soc_dapm_force_bias_level(
-               snd_soc_component_get_dapm(component),
-               level);
-}
-
 /**
  * snd_soc_dapm_kcontrol_component() - Returns the component associated to a
  * kcontrol

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 53bf6590bd4b13221f0fbd20dec8fbd6fd71d522..5bd9a27b12baa8afbf884d358c00f70fedbc9ef4 100644 (file)
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -725,6 +725,9 @@ int snd_soc_dapm_force_bias_level(struct snd_soc_dapm_context *dapm, enum snd_so
 enum snd_soc_bias_level snd_soc_dapm_get_bias_level(struct snd_soc_dapm_context *dapm);
 void snd_soc_dapm_init_bias_level(struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level);
 
+// REMOVE ME !!
+#define snd_soc_component_force_bias_level(c, l)       snd_soc_dapm_force_bias_level(&(c)->dapm, l)
+
 #define for_each_dapm_widgets(list, i, widget)                         \
        for ((i) = 0;                                                   \
             (i) < list->num_widgets && (widget = list->widgets[i]);    \