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

diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c
index b977a2db73a3a7d81bb90b89ddfccc207722a6a6..249be121be157432208e3627098d2bc9b123ef0a 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_rt5645.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5645.c
@@ -66,8 +66,7 @@ static void log_quirks(struct device *dev)
 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 cht_mc_private *ctx = snd_soc_card_get_drvdata(card);
        int ret;
@@ -250,6 +249,7 @@ static const struct dmi_system_id cht_rt5645_quirk_table[] = {
 static int cht_codec_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 cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card);
        struct snd_soc_component *component = snd_soc_rtd_to_codec(runtime, 0)->component;
        int jack_type;
@@ -275,19 +275,19 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
        }
 
        if (cht_rt5645_quirk & CHT_RT5645_SSP2_AIF2) {
-               ret = snd_soc_dapm_add_routes(&card->dapm,
+               ret = snd_soc_dapm_add_routes(dapm,
                                        cht_rt5645_ssp2_aif2_map,
                                        ARRAY_SIZE(cht_rt5645_ssp2_aif2_map));
        } else if (cht_rt5645_quirk & CHT_RT5645_SSP0_AIF1) {
-               ret = snd_soc_dapm_add_routes(&card->dapm,
+               ret = snd_soc_dapm_add_routes(dapm,
                                        cht_rt5645_ssp0_aif1_map,
                                        ARRAY_SIZE(cht_rt5645_ssp0_aif1_map));
        } else if (cht_rt5645_quirk & CHT_RT5645_SSP0_AIF2) {
-               ret = snd_soc_dapm_add_routes(&card->dapm,
+               ret = snd_soc_dapm_add_routes(dapm,
                                        cht_rt5645_ssp0_aif2_map,
                                        ARRAY_SIZE(cht_rt5645_ssp0_aif2_map));
        } else {
-               ret = snd_soc_dapm_add_routes(&card->dapm,
+               ret = snd_soc_dapm_add_routes(dapm,
                                        cht_rt5645_ssp2_aif1_map,
                                        ARRAY_SIZE(cht_rt5645_ssp2_aif1_map));
        }