Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Kuninori Morimoto and committed by
Mark Brown
620fd65e 311c12f7

+15 -15
+15 -15
sound/soc/samsung/smdk_wm8994.c
··· 69 69 70 70 static int smdk_wm8994_init_paiftx(struct snd_soc_pcm_runtime *rtd) 71 71 { 72 - struct snd_soc_dapm_context *dapm = &rtd->card->dapm; 72 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(rtd->card); 73 73 74 74 /* Other pins NC */ 75 - snd_soc_dapm_nc_pin(dapm, "HPOUT2P"); 76 - snd_soc_dapm_nc_pin(dapm, "HPOUT2N"); 77 - snd_soc_dapm_nc_pin(dapm, "SPKOUTLN"); 78 - snd_soc_dapm_nc_pin(dapm, "SPKOUTLP"); 79 - snd_soc_dapm_nc_pin(dapm, "SPKOUTRP"); 80 - snd_soc_dapm_nc_pin(dapm, "SPKOUTRN"); 81 - snd_soc_dapm_nc_pin(dapm, "LINEOUT1N"); 82 - snd_soc_dapm_nc_pin(dapm, "LINEOUT1P"); 83 - snd_soc_dapm_nc_pin(dapm, "LINEOUT2N"); 84 - snd_soc_dapm_nc_pin(dapm, "LINEOUT2P"); 85 - snd_soc_dapm_nc_pin(dapm, "IN1LP"); 86 - snd_soc_dapm_nc_pin(dapm, "IN2LP:VXRN"); 87 - snd_soc_dapm_nc_pin(dapm, "IN1RP"); 88 - snd_soc_dapm_nc_pin(dapm, "IN2RP:VXRP"); 75 + snd_soc_dapm_disable_pin(dapm, "HPOUT2P"); 76 + snd_soc_dapm_disable_pin(dapm, "HPOUT2N"); 77 + snd_soc_dapm_disable_pin(dapm, "SPKOUTLN"); 78 + snd_soc_dapm_disable_pin(dapm, "SPKOUTLP"); 79 + snd_soc_dapm_disable_pin(dapm, "SPKOUTRP"); 80 + snd_soc_dapm_disable_pin(dapm, "SPKOUTRN"); 81 + snd_soc_dapm_disable_pin(dapm, "LINEOUT1N"); 82 + snd_soc_dapm_disable_pin(dapm, "LINEOUT1P"); 83 + snd_soc_dapm_disable_pin(dapm, "LINEOUT2N"); 84 + snd_soc_dapm_disable_pin(dapm, "LINEOUT2P"); 85 + snd_soc_dapm_disable_pin(dapm, "IN1LP"); 86 + snd_soc_dapm_disable_pin(dapm, "IN2LP:VXRN"); 87 + snd_soc_dapm_disable_pin(dapm, "IN1RP"); 88 + snd_soc_dapm_disable_pin(dapm, "IN2RP:VXRP"); 89 89 90 90 return 0; 91 91 }