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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
bbbd507a f9728952

+5 -6
+5 -6
sound/soc/codecs/max98396.c
··· 953 953 static int max98396_mux_get(struct snd_kcontrol *kcontrol, 954 954 struct snd_ctl_elem_value *ucontrol) 955 955 { 956 - struct snd_soc_component *component = 957 - snd_soc_dapm_kcontrol_component(kcontrol); 956 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 958 957 struct max98396_priv *max98396 = snd_soc_component_get_drvdata(component); 959 958 int reg, val; 960 959 ··· 972 973 static int max98396_mux_put(struct snd_kcontrol *kcontrol, 973 974 struct snd_ctl_elem_value *ucontrol) 974 975 { 975 - struct snd_soc_component *component = 976 - snd_soc_dapm_kcontrol_component(kcontrol); 977 - struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol); 976 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 977 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 978 978 struct max98396_priv *max98396 = snd_soc_component_get_drvdata(component); 979 979 struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; 980 980 unsigned int *item = ucontrol->value.enumerated.item; ··· 1105 1107 struct snd_ctl_elem_value *ucontrol) 1106 1108 { 1107 1109 struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 1110 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1108 1111 struct soc_mixer_control *mc = 1109 1112 (struct soc_mixer_control *)kcontrol->private_value; 1110 1113 struct max98396_priv *max98396 = snd_soc_component_get_drvdata(component); ··· 1114 1115 int reg = mc->reg; 1115 1116 1116 1117 /* ADC value is not available if the device is powered down */ 1117 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) 1118 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) 1118 1119 goto exit; 1119 1120 1120 1121 if (max98396->device_id == CODEC_TYPE_MAX98397) {