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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
0e8d0789 10d5d21a

+4 -3
+4 -3
sound/soc/codecs/wm8995.c
··· 547 547 static int wm8995_put_class_w(struct snd_kcontrol *kcontrol, 548 548 struct snd_ctl_elem_value *ucontrol) 549 549 { 550 - struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol); 550 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 551 551 int ret; 552 552 553 553 ret = snd_soc_dapm_put_volsw(kcontrol, ucontrol); ··· 718 718 719 719 static int configure_clock(struct snd_soc_component *component) 720 720 { 721 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 721 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 722 722 struct wm8995_priv *wm8995; 723 723 int change, new; 724 724 ··· 1955 1955 static int wm8995_set_bias_level(struct snd_soc_component *component, 1956 1956 enum snd_soc_bias_level level) 1957 1957 { 1958 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1958 1959 struct wm8995_priv *wm8995; 1959 1960 int ret; 1960 1961 ··· 1965 1964 case SND_SOC_BIAS_PREPARE: 1966 1965 break; 1967 1966 case SND_SOC_BIAS_STANDBY: 1968 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 1967 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 1969 1968 ret = regulator_bulk_enable(ARRAY_SIZE(wm8995->supplies), 1970 1969 wm8995->supplies); 1971 1970 if (ret)