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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
3df33a9e 16d4e861

+4 -4
+4 -4
sound/soc/codecs/lpass-tx-macro.c
··· 800 800 static int tx_macro_put_dec_enum(struct snd_kcontrol *kcontrol, 801 801 struct snd_ctl_elem_value *ucontrol) 802 802 { 803 - struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_widget(kcontrol); 803 + struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol); 804 804 struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm); 805 805 struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; 806 806 struct tx_macro *tx = snd_soc_component_get_drvdata(component); ··· 859 859 static int tx_macro_tx_mixer_get(struct snd_kcontrol *kcontrol, 860 860 struct snd_ctl_elem_value *ucontrol) 861 861 { 862 - struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_widget(kcontrol); 862 + struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol); 863 863 struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm); 864 864 struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; 865 865 u32 dai_id = widget->shift; ··· 877 877 static int tx_macro_tx_mixer_put(struct snd_kcontrol *kcontrol, 878 878 struct snd_ctl_elem_value *ucontrol) 879 879 { 880 - struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_widget(kcontrol); 880 + struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol); 881 881 struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm); 882 882 struct snd_soc_dapm_update *update = NULL; 883 883 struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; ··· 2081 2081 2082 2082 static int tx_macro_component_extend(struct snd_soc_component *comp) 2083 2083 { 2084 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(comp); 2084 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(comp); 2085 2085 struct tx_macro *tx = snd_soc_component_get_drvdata(comp); 2086 2086 int ret; 2087 2087