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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
d4ed7da0 19bf3fb9

+3 -2
+3 -2
sound/soc/codecs/wm8985.c
··· 564 564 static int wm8985_add_widgets(struct snd_soc_component *component) 565 565 { 566 566 struct wm8985_priv *wm8985 = snd_soc_component_get_drvdata(component); 567 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 567 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 568 568 569 569 switch (wm8985->dev_type) { 570 570 case WM8758: ··· 948 948 enum snd_soc_bias_level level) 949 949 { 950 950 int ret; 951 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 951 952 struct wm8985_priv *wm8985; 952 953 953 954 wm8985 = snd_soc_component_get_drvdata(component); ··· 961 960 1 << WM8985_VMIDSEL_SHIFT); 962 961 break; 963 962 case SND_SOC_BIAS_STANDBY: 964 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 963 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 965 964 ret = regulator_bulk_enable(ARRAY_SIZE(wm8985->supplies), 966 965 wm8985->supplies); 967 966 if (ret) {