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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
8a19eabf 1a8870e2

+4 -4
+4 -4
sound/soc/codecs/wm8998.c
··· 101 101 static int wm8998_inmux_put(struct snd_kcontrol *kcontrol, 102 102 struct snd_ctl_elem_value *ucontrol) 103 103 { 104 - struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol); 105 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 104 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 105 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 106 106 struct wm8998_priv *wm8998 = snd_soc_component_get_drvdata(component); 107 107 struct arizona *arizona = wm8998->core.arizona; 108 108 struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; ··· 1279 1279 static int wm8998_component_probe(struct snd_soc_component *component) 1280 1280 { 1281 1281 struct wm8998_priv *priv = snd_soc_component_get_drvdata(component); 1282 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 1282 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1283 1283 struct arizona *arizona = priv->core.arizona; 1284 1284 int ret; 1285 1285 ··· 1292 1292 1293 1293 arizona_init_gpio(component); 1294 1294 1295 - snd_soc_component_disable_pin(component, "HAPTICS"); 1295 + snd_soc_dapm_disable_pin(dapm, "HAPTICS"); 1296 1296 1297 1297 return 0; 1298 1298 }