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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
24bca180 52239c55

+7 -13
+7 -13
sound/soc/codecs/rt712-sdca.c
··· 743 743 static int rt712_sdca_mux_get(struct snd_kcontrol *kcontrol, 744 744 struct snd_ctl_elem_value *ucontrol) 745 745 { 746 - struct snd_soc_component *component = 747 - snd_soc_dapm_kcontrol_component(kcontrol); 746 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 748 747 struct rt712_sdca_priv *rt712 = snd_soc_component_get_drvdata(component); 749 748 unsigned int val = 0, mask = 0x3300; 750 749 ··· 767 768 static int rt712_sdca_mux_put(struct snd_kcontrol *kcontrol, 768 769 struct snd_ctl_elem_value *ucontrol) 769 770 { 770 - struct snd_soc_component *component = 771 - snd_soc_dapm_kcontrol_component(kcontrol); 772 - struct snd_soc_dapm_context *dapm = 773 - snd_soc_dapm_kcontrol_dapm(kcontrol); 771 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 772 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 774 773 struct rt712_sdca_priv *rt712 = snd_soc_component_get_drvdata(component); 775 774 struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; 776 775 unsigned int *item = ucontrol->value.enumerated.item; ··· 1014 1017 1015 1018 static int rt712_sdca_probe(struct snd_soc_component *component) 1016 1019 { 1017 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 1020 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1018 1021 struct rt712_sdca_priv *rt712 = snd_soc_component_get_drvdata(component); 1019 1022 int ret; 1020 1023 ··· 1227 1230 static int rt712_sdca_dmic_mux_get(struct snd_kcontrol *kcontrol, 1228 1231 struct snd_ctl_elem_value *ucontrol) 1229 1232 { 1230 - struct snd_soc_component *component = 1231 - snd_soc_dapm_kcontrol_component(kcontrol); 1233 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 1232 1234 struct rt712_sdca_priv *rt712 = snd_soc_component_get_drvdata(component); 1233 1235 unsigned int val = 0, mask_sft; 1234 1236 ··· 1249 1253 static int rt712_sdca_dmic_mux_put(struct snd_kcontrol *kcontrol, 1250 1254 struct snd_ctl_elem_value *ucontrol) 1251 1255 { 1252 - struct snd_soc_component *component = 1253 - snd_soc_dapm_kcontrol_component(kcontrol); 1254 - struct snd_soc_dapm_context *dapm = 1255 - snd_soc_dapm_kcontrol_dapm(kcontrol); 1256 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 1257 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 1256 1258 struct rt712_sdca_priv *rt712 = snd_soc_component_get_drvdata(component); 1257 1259 struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; 1258 1260 unsigned int *item = ucontrol->value.enumerated.item;