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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
5b08edab 4f9d291e

+4 -2
+4 -2
sound/soc/codecs/wm8903.c
··· 369 369 static int wm8903_class_w_put(struct snd_kcontrol *kcontrol, 370 370 struct snd_ctl_elem_value *ucontrol) 371 371 { 372 - struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol); 372 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 373 373 struct wm8903_priv *wm8903 = snd_soc_component_get_drvdata(component); 374 374 u16 reg; 375 375 int ret; ··· 1099 1099 static int wm8903_set_bias_level(struct snd_soc_component *component, 1100 1100 enum snd_soc_bias_level level) 1101 1101 { 1102 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1103 + 1102 1104 switch (level) { 1103 1105 case SND_SOC_BIAS_ON: 1104 1106 break; ··· 1112 1110 break; 1113 1111 1114 1112 case SND_SOC_BIAS_STANDBY: 1115 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 1113 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 1116 1114 snd_soc_component_update_bits(component, WM8903_BIAS_CONTROL_0, 1117 1115 WM8903_POBCTRL | WM8903_ISEL_MASK | 1118 1116 WM8903_STARTUP_BIAS_ENA |