ASoC: intel: boards: bytcr_rt5651: 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/87v7jhwgro.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
index ca540a66f22ce05768ff0996ba345a6a57f20751..68cf463f1d5070a34466d3809a31645b804f0cf5 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -188,8 +188,7 @@ static int byt_rt5651_prepare_and_enable_pll1(struct snd_soc_dai *codec_dai,
 static int platform_clock_control(struct snd_soc_dapm_widget *w,
                                  struct snd_kcontrol *k, int  event)
 {
-       struct snd_soc_dapm_context *dapm = w->dapm;
-       struct snd_soc_card *card = dapm->card;
+       struct snd_soc_card *card = snd_soc_dapm_to_card(w->dapm);
        struct snd_soc_dai *codec_dai;
        struct byt_rt5651_private *priv = snd_soc_card_get_drvdata(card);
        int ret;
@@ -234,7 +233,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
 static int rt5651_ext_amp_power_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
 {
-       struct snd_soc_card *card = w->dapm->card;
+       struct snd_soc_card *card = snd_soc_dapm_to_card(w->dapm);
        struct byt_rt5651_private *priv = snd_soc_card_get_drvdata(card);
 
        if (SND_SOC_DAPM_EVENT_ON(event))
@@ -579,6 +578,7 @@ static int byt_rt5651_add_codec_device_props(struct device *i2c_dev,
 static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
 {
        struct snd_soc_card *card = runtime->card;
+       struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
        struct snd_soc_component *codec = snd_soc_rtd_to_codec(runtime, 0)->component;
        struct byt_rt5651_private *priv = snd_soc_card_get_drvdata(card);
        const struct snd_soc_dapm_route *custom_map;
@@ -586,7 +586,7 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
        int report;
        int ret;
 
-       card->dapm.idle_bias = false;
+       snd_soc_dapm_set_idle_bias(dapm, false);
 
        /* Start with RC clk for jack-detect (we disable MCLK below) */
        if (byt_rt5651_quirk & BYT_RT5651_MCLK_EN)
@@ -610,24 +610,24 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
                custom_map = byt_rt5651_intmic_dmic_map;
                num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic_map);
        }
-       ret = snd_soc_dapm_add_routes(&card->dapm, custom_map, num_routes);
+       ret = snd_soc_dapm_add_routes(dapm, custom_map, num_routes);
        if (ret)
                return ret;
 
        if (byt_rt5651_quirk & BYT_RT5651_SSP2_AIF2) {
-               ret = snd_soc_dapm_add_routes(&card->dapm,
+               ret = snd_soc_dapm_add_routes(dapm,
                                        byt_rt5651_ssp2_aif2_map,
                                        ARRAY_SIZE(byt_rt5651_ssp2_aif2_map));
        } else if (byt_rt5651_quirk & BYT_RT5651_SSP0_AIF1) {
-               ret = snd_soc_dapm_add_routes(&card->dapm,
+               ret = snd_soc_dapm_add_routes(dapm,
                                        byt_rt5651_ssp0_aif1_map,
                                        ARRAY_SIZE(byt_rt5651_ssp0_aif1_map));
        } else if (byt_rt5651_quirk & BYT_RT5651_SSP0_AIF2) {
-               ret = snd_soc_dapm_add_routes(&card->dapm,
+               ret = snd_soc_dapm_add_routes(dapm,
                                        byt_rt5651_ssp0_aif2_map,
                                        ARRAY_SIZE(byt_rt5651_ssp0_aif2_map));
        } else {
-               ret = snd_soc_dapm_add_routes(&card->dapm,
+               ret = snd_soc_dapm_add_routes(dapm,
                                        byt_rt5651_ssp2_aif1_map,
                                        ARRAY_SIZE(byt_rt5651_ssp2_aif1_map));
        }