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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
1c4143ea b6ba1a11

+3 -3
+3 -3
sound/soc/samsung/tobermory.c
··· 24 24 rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); 25 25 codec_dai = snd_soc_rtd_to_codec(rtd, 0); 26 26 27 - if (dapm->dev != codec_dai->dev) 27 + if (snd_soc_dapm_to_dev(dapm) != codec_dai->dev) 28 28 return 0; 29 29 30 30 switch (level) { 31 31 case SND_SOC_BIAS_PREPARE: 32 - if (dapm->bias_level == SND_SOC_BIAS_STANDBY) { 32 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_STANDBY) { 33 33 ret = snd_soc_dai_set_pll(codec_dai, WM8962_FLL, 34 34 WM8962_FLL_MCLK, 32768, 35 35 sample_rate * 512); ··· 67 67 rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); 68 68 codec_dai = snd_soc_rtd_to_codec(rtd, 0); 69 69 70 - if (dapm->dev != codec_dai->dev) 70 + if (snd_soc_dapm_to_dev(dapm) != codec_dai->dev) 71 71 return 0; 72 72 73 73 switch (level) {