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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
4e111f49 7881b033

+5 -2
+5 -2
sound/soc/codecs/wm8990.c
··· 1017 1017 enum snd_soc_bias_level level) 1018 1018 { 1019 1019 struct wm8990_priv *wm8990 = snd_soc_component_get_drvdata(component); 1020 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1020 1021 int ret; 1021 1022 1022 1023 switch (level) { ··· 1031 1030 break; 1032 1031 1033 1032 case SND_SOC_BIAS_STANDBY: 1034 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 1033 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 1035 1034 ret = regcache_sync(wm8990->regmap); 1036 1035 if (ret < 0) { 1037 1036 dev_err(component->dev, "Failed to sync cache: %d\n", ret); ··· 1185 1184 */ 1186 1185 static int wm8990_probe(struct snd_soc_component *component) 1187 1186 { 1187 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1188 + 1188 1189 wm8990_reset(component); 1189 1190 1190 1191 /* charge output caps */ 1191 - snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY); 1192 + snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_STANDBY); 1192 1193 1193 1194 snd_soc_component_update_bits(component, WM8990_AUDIO_INTERFACE_4, 1194 1195 WM8990_ALRCGPIO1, WM8990_ALRCGPIO1);