ASoC: codecs: arizona: convert to snd_soc_dapm_xxx()

This patch converts below functions.

dapm->dev					-> snd_soc_dapm_to_dev()
dapm->card					-> snd_soc_dapm_to_card()
dapm->component					-> snd_soc_dapm_to_component()

dapm_kcontrol_get_value()			-> snd_soc_dapm_kcontrol_get_value()

snd_soc_component_enable_pin()			-> snd_soc_dapm_enable_pin()
snd_soc_component_enable_pin_unlocked()		-> snd_soc_dapm_enable_pin_unlocked()
snd_soc_component_disable_pin()			-> snd_soc_dapm_disable_pin()
snd_soc_component_disable_pin_unlocked()	-> snd_soc_dapm_disable_pin_unlocked()
snd_soc_component_nc_pin()			-> snd_soc_dapm_nc_pin()
snd_soc_component_nc_pin_unlocked()		-> snd_soc_dapm_nc_pin_unlocked()
snd_soc_component_get_pin_status()		-> snd_soc_dapm_get_pin_status()
snd_soc_component_force_enable_pin()		-> snd_soc_dapm_force_enable_pin()
snd_soc_component_force_enable_pin_unlocked()	-> snd_soc_dapm_force_enable_pin_unlocked()
snd_soc_component_force_bias_level()		-> snd_soc_dapm_force_bias_level()
snd_soc_component_get_bias_level()		-> snd_soc_dapm_get_bias_level()
snd_soc_component_init_bias_level()		-> snd_soc_dapm_init_bias_level()
snd_soc_component_get_dapm()			-> snd_soc_component_to_dapm()

snd_soc_dapm_kcontrol_component()		-> snd_soc_dapm_kcontrol_to_component()
snd_soc_dapm_kcontrol_widget()			-> snd_soc_dapm_kcontrol_to_widget()
snd_soc_dapm_kcontrol_dapm()			-> snd_soc_dapm_kcontrol_to_dapm()
snd_soc_dapm_np_pin()				-> snd_soc_dapm_disable_pin()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/87fraasihe.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 99884dc6ff86e288e1c5aeefc965e0a5b671c199..8c683b0bb74c4c9ed390a46d6476d979430b6ffe 100644 (file)
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -169,7 +169,7 @@ static const struct snd_soc_dapm_widget arizona_spkr =
 
 int arizona_init_spk(struct snd_soc_component *component)
 {
-       struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+       struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
        struct arizona_priv *priv = snd_soc_component_get_drvdata(component);
        struct arizona *arizona = priv->arizona;
        int ret;
@@ -238,7 +238,7 @@ static const struct snd_soc_dapm_route arizona_mono_routes[] = {
 
 int arizona_init_mono(struct snd_soc_component *component)
 {
-       struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+       struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
        struct arizona_priv *priv = snd_soc_component_get_drvdata(component);
        struct arizona *arizona = priv->arizona;
        int i;
@@ -255,6 +255,7 @@ EXPORT_SYMBOL_GPL(arizona_init_mono);
 
 int arizona_init_gpio(struct snd_soc_component *component)
 {
+       struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
        struct arizona_priv *priv = snd_soc_component_get_drvdata(component);
        struct arizona *arizona = priv->arizona;
        int i;
@@ -262,24 +263,21 @@ int arizona_init_gpio(struct snd_soc_component *component)
        switch (arizona->type) {
        case WM5110:
        case WM8280:
-               snd_soc_component_disable_pin(component,
-                                             "DRC2 Signal Activity");
+               snd_soc_dapm_disable_pin(dapm, "DRC2 Signal Activity");
                break;
        default:
                break;
        }
 
-       snd_soc_component_disable_pin(component, "DRC1 Signal Activity");
+       snd_soc_dapm_disable_pin(dapm, "DRC1 Signal Activity");
 
        for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) {
                switch (arizona->pdata.gpio_defaults[i] & ARIZONA_GPN_FN_MASK) {
                case ARIZONA_GP_FN_DRC1_SIGNAL_DETECT:
-                       snd_soc_component_enable_pin(component,
-                                                    "DRC1 Signal Activity");
+                       snd_soc_dapm_enable_pin(dapm, "DRC1 Signal Activity");
                        break;
                case ARIZONA_GP_FN_DRC2_SIGNAL_DETECT:
-                       snd_soc_component_enable_pin(component,
-                                                    "DRC2 Signal Activity");
+                       snd_soc_dapm_enable_pin(dapm, "DRC2 Signal Activity");
                        break;
                default:
                        break;
@@ -1911,7 +1909,7 @@ static int arizona_dai_set_sysclk(struct snd_soc_dai *dai,
                                  int clk_id, unsigned int freq, int dir)
 {
        struct snd_soc_component *component = dai->component;
-       struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+       struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
        struct arizona_priv *priv = snd_soc_component_get_drvdata(component);
        struct arizona_dai_priv *dai_priv = &priv->dai[dai->id - 1];
        struct snd_soc_dapm_route routes[2];