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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
c2bdc030 2cc32597

+4 -3
+4 -3
sound/soc/codecs/wm9712.c
··· 215 215 static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol, 216 216 struct snd_ctl_elem_value *ucontrol) 217 217 { 218 - struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol); 218 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 219 219 struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); 220 220 struct wm9712_priv *wm9712 = snd_soc_component_get_drvdata(component); 221 221 unsigned int val = ucontrol->value.integer.value[0]; ··· 259 259 static int wm9712_hp_mixer_get(struct snd_kcontrol *kcontrol, 260 260 struct snd_ctl_elem_value *ucontrol) 261 261 { 262 - struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol); 262 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 263 263 struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); 264 264 struct wm9712_priv *wm9712 = snd_soc_component_get_drvdata(component); 265 265 struct soc_mixer_control *mc = ··· 611 611 static int wm9712_soc_resume(struct snd_soc_component *component) 612 612 { 613 613 struct wm9712_priv *wm9712 = snd_soc_component_get_drvdata(component); 614 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 614 615 int ret; 615 616 616 617 ret = snd_ac97_reset(wm9712->ac97, true, WM9712_VENDOR_ID, ··· 619 618 if (ret < 0) 620 619 return ret; 621 620 622 - snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY); 621 + snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_STANDBY); 623 622 624 623 if (ret == 0) 625 624 snd_soc_component_cache_sync(component);