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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
e70ef8a9 0e435dd5

+4 -4
+4 -4
sound/soc/codecs/wm_hubs.c
··· 694 694 static int class_w_put_volsw(struct snd_kcontrol *kcontrol, 695 695 struct snd_ctl_elem_value *ucontrol) 696 696 { 697 - struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol); 697 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 698 698 int ret; 699 699 700 700 ret = snd_soc_dapm_put_volsw(kcontrol, ucontrol); ··· 714 714 static int class_w_put_double(struct snd_kcontrol *kcontrol, 715 715 struct snd_ctl_elem_value *ucontrol) 716 716 { 717 - struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol); 717 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 718 718 int ret; 719 719 720 720 ret = snd_soc_dapm_put_enum_double(kcontrol, ucontrol); ··· 1112 1112 1113 1113 int wm_hubs_add_analogue_controls(struct snd_soc_component *component) 1114 1114 { 1115 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 1115 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1116 1116 1117 1117 /* Latch volume update bits & default ZC on */ 1118 1118 snd_soc_component_update_bits(component, WM8993_LEFT_LINE_INPUT_1_2_VOLUME, ··· 1156 1156 int lineout1_diff, int lineout2_diff) 1157 1157 { 1158 1158 struct wm_hubs_data *hubs = snd_soc_component_get_drvdata(component); 1159 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 1159 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1160 1160 1161 1161 hubs->component = component; 1162 1162