ASoC: samsung: smdk_wm8994: 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/878qgdv235.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c
index acb29cd785a90de7fbee152b7103c88a029625bd..911f56b12f0a8335c168b4a98928f75d70e411e1 100644 (file)
--- a/sound/soc/samsung/smdk_wm8994.c
+++ b/sound/soc/samsung/smdk_wm8994.c
@@ -69,23 +69,23 @@ static const struct snd_soc_ops smdk_ops = {
 
 static int smdk_wm8994_init_paiftx(struct snd_soc_pcm_runtime *rtd)
 {
-       struct snd_soc_dapm_context *dapm = &rtd->card->dapm;
+       struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(rtd->card);
 
        /* Other pins NC */
-       snd_soc_dapm_nc_pin(dapm, "HPOUT2P");
-       snd_soc_dapm_nc_pin(dapm, "HPOUT2N");
-       snd_soc_dapm_nc_pin(dapm, "SPKOUTLN");
-       snd_soc_dapm_nc_pin(dapm, "SPKOUTLP");
-       snd_soc_dapm_nc_pin(dapm, "SPKOUTRP");
-       snd_soc_dapm_nc_pin(dapm, "SPKOUTRN");
-       snd_soc_dapm_nc_pin(dapm, "LINEOUT1N");
-       snd_soc_dapm_nc_pin(dapm, "LINEOUT1P");
-       snd_soc_dapm_nc_pin(dapm, "LINEOUT2N");
-       snd_soc_dapm_nc_pin(dapm, "LINEOUT2P");
-       snd_soc_dapm_nc_pin(dapm, "IN1LP");
-       snd_soc_dapm_nc_pin(dapm, "IN2LP:VXRN");
-       snd_soc_dapm_nc_pin(dapm, "IN1RP");
-       snd_soc_dapm_nc_pin(dapm, "IN2RP:VXRP");
+       snd_soc_dapm_disable_pin(dapm, "HPOUT2P");
+       snd_soc_dapm_disable_pin(dapm, "HPOUT2N");
+       snd_soc_dapm_disable_pin(dapm, "SPKOUTLN");
+       snd_soc_dapm_disable_pin(dapm, "SPKOUTLP");
+       snd_soc_dapm_disable_pin(dapm, "SPKOUTRP");
+       snd_soc_dapm_disable_pin(dapm, "SPKOUTRN");
+       snd_soc_dapm_disable_pin(dapm, "LINEOUT1N");
+       snd_soc_dapm_disable_pin(dapm, "LINEOUT1P");
+       snd_soc_dapm_disable_pin(dapm, "LINEOUT2N");
+       snd_soc_dapm_disable_pin(dapm, "LINEOUT2P");
+       snd_soc_dapm_disable_pin(dapm, "IN1LP");
+       snd_soc_dapm_disable_pin(dapm, "IN2LP:VXRN");
+       snd_soc_dapm_disable_pin(dapm, "IN1RP");
+       snd_soc_dapm_disable_pin(dapm, "IN2RP:VXRP");
 
        return 0;
 }