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

ASoC: codecs: rt711-sdca: 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/87ikfh2z5h.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
49a22e98 1b301182

+3 -6
+3 -6
sound/soc/codecs/rt711-sdca.c
··· 900 900 static int rt711_sdca_mux_get(struct snd_kcontrol *kcontrol, 901 901 struct snd_ctl_elem_value *ucontrol) 902 902 { 903 - struct snd_soc_component *component = 904 - snd_soc_dapm_kcontrol_component(kcontrol); 903 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 905 904 struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component); 906 905 unsigned int val = 0, mask_sft; 907 906 ··· 922 923 static int rt711_sdca_mux_put(struct snd_kcontrol *kcontrol, 923 924 struct snd_ctl_elem_value *ucontrol) 924 925 { 925 - struct snd_soc_component *component = 926 - snd_soc_dapm_kcontrol_component(kcontrol); 927 - struct snd_soc_dapm_context *dapm = 928 - snd_soc_dapm_kcontrol_dapm(kcontrol); 926 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 927 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 929 928 struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component); 930 929 struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; 931 930 unsigned int *item = ucontrol->value.enumerated.item;