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

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 6ca114c30ae16864399bc5cafa9dfd80f0bc1937..3d9d8a97d153838a5c54c3b0ead5f4b6d71c4eeb 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -408,7 +408,7 @@ static const struct snd_soc_ops sof_rt5682_ops = {
 static int sof_card_late_probe(struct snd_soc_card *card)
 {
        struct sof_card_private *ctx = snd_soc_card_get_drvdata(card);
-       struct snd_soc_dapm_context *dapm = &card->dapm;
+       struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
        int err;
 
        if (ctx->amp_type == CODEC_MAX98373) {
@@ -462,9 +462,10 @@ static const struct snd_soc_dapm_route rt5650_spk_dapm_routes[] = {
 static int rt5650_spk_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_card *card = rtd->card;
+       struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
        int ret;
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, rt5650_spk_widgets,
+       ret = snd_soc_dapm_new_controls(dapm, rt5650_spk_widgets,
                                        ARRAY_SIZE(rt5650_spk_widgets));
        if (ret) {
                dev_err(rtd->dev, "fail to add rt5650 spk widgets, ret %d\n",
@@ -480,7 +481,7 @@ static int rt5650_spk_init(struct snd_soc_pcm_runtime *rtd)
                return ret;
        }
 
-       ret = snd_soc_dapm_add_routes(&card->dapm, rt5650_spk_dapm_routes,
+       ret = snd_soc_dapm_add_routes(dapm, rt5650_spk_dapm_routes,
                                      ARRAY_SIZE(rt5650_spk_dapm_routes));
        if (ret)
                dev_err(rtd->dev, "fail to add dapm routes, ret=%d\n", ret);