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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
d1cca4a4 620fd65e

+13 -11
+13 -11
sound/soc/samsung/speyside.c
··· 27 27 rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[1]); 28 28 codec_dai = snd_soc_rtd_to_codec(rtd, 0); 29 29 30 - if (dapm->dev != codec_dai->dev) 30 + if (snd_soc_dapm_to_dev(dapm) != codec_dai->dev) 31 31 return 0; 32 32 33 33 switch (level) { ··· 63 63 rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[1]); 64 64 codec_dai = snd_soc_rtd_to_codec(rtd, 0); 65 65 66 - if (dapm->dev != codec_dai->dev) 66 + if (snd_soc_dapm_to_dev(dapm) != codec_dai->dev) 67 67 return 0; 68 68 69 69 switch (level) { 70 70 case SND_SOC_BIAS_PREPARE: 71 - if (card->dapm.bias_level == SND_SOC_BIAS_STANDBY) { 71 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_STANDBY) { 72 72 ret = snd_soc_dai_set_pll(codec_dai, 0, 73 73 WM8996_FLL_MCLK2, 74 74 32768, MCLK_AUDIO_RATE); ··· 125 125 gpiod_direction_output(speyside_hpsel_gpio, speyside_jack_polarity); 126 126 127 127 /* Re-run DAPM to make sure we're using the correct mic bias */ 128 - snd_soc_dapm_sync(snd_soc_component_get_dapm(component)); 128 + snd_soc_dapm_sync(snd_soc_component_to_dapm(component)); 129 129 } 130 130 131 131 static int speyside_wm0010_init(struct snd_soc_pcm_runtime *rtd) ··· 177 177 178 178 static int speyside_late_probe(struct snd_soc_card *card) 179 179 { 180 - snd_soc_dapm_ignore_suspend(&card->dapm, "Headphone"); 181 - snd_soc_dapm_ignore_suspend(&card->dapm, "Headset Mic"); 182 - snd_soc_dapm_ignore_suspend(&card->dapm, "Main AMIC"); 183 - snd_soc_dapm_ignore_suspend(&card->dapm, "Main DMIC"); 184 - snd_soc_dapm_ignore_suspend(&card->dapm, "Main Speaker"); 185 - snd_soc_dapm_ignore_suspend(&card->dapm, "WM1250 Output"); 186 - snd_soc_dapm_ignore_suspend(&card->dapm, "WM1250 Input"); 180 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); 181 + 182 + snd_soc_dapm_ignore_suspend(dapm, "Headphone"); 183 + snd_soc_dapm_ignore_suspend(dapm, "Headset Mic"); 184 + snd_soc_dapm_ignore_suspend(dapm, "Main AMIC"); 185 + snd_soc_dapm_ignore_suspend(dapm, "Main DMIC"); 186 + snd_soc_dapm_ignore_suspend(dapm, "Main Speaker"); 187 + snd_soc_dapm_ignore_suspend(dapm, "WM1250 Output"); 188 + snd_soc_dapm_ignore_suspend(dapm, "WM1250 Input"); 187 189 188 190 return 0; 189 191 }