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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
8efb94a9 58fc7681

+2 -1
+2 -1
sound/soc/codecs/wm8971.c
··· 561 561 enum snd_soc_bias_level level) 562 562 { 563 563 struct wm8971_priv *wm8971 = snd_soc_component_get_drvdata(component); 564 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 564 565 u16 pwr_reg = snd_soc_component_read(component, WM8971_PWR1) & 0xfe3e; 565 566 566 567 switch (level) { ··· 574 573 flush_delayed_work(&wm8971->charge_work); 575 574 break; 576 575 case SND_SOC_BIAS_STANDBY: 577 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 576 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 578 577 snd_soc_component_cache_sync(component); 579 578 /* charge output caps - set vmid to 5k for quick power up */ 580 579 snd_soc_component_write(component, WM8971_PWR1, pwr_reg | 0x01c0);