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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
a3de4a9c eba22be8

+5 -5
+5 -5
sound/soc/codecs/wm5110.c
··· 403 403 struct snd_ctl_elem_value *ucontrol) 404 404 { 405 405 struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 406 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 406 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 407 407 struct arizona *arizona = dev_get_drvdata(component->dev->parent); 408 408 struct soc_mixer_control *mc = 409 409 (struct soc_mixer_control *)kcontrol->private_value; ··· 468 468 struct snd_ctl_elem_value *ucontrol) 469 469 { 470 470 struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 471 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 471 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 472 472 int ret; 473 473 474 474 /* ··· 488 488 struct snd_ctl_elem_value *ucontrol) 489 489 { 490 490 struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 491 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 491 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 492 492 int ret; 493 493 494 494 /* ··· 2297 2297 2298 2298 static int wm5110_component_probe(struct snd_soc_component *component) 2299 2299 { 2300 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 2300 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 2301 2301 struct wm5110_priv *priv = snd_soc_component_get_drvdata(component); 2302 2302 struct arizona *arizona = priv->core.arizona; 2303 2303 int i, ret; ··· 2324 2324 if (ret) 2325 2325 goto err_adsp2_codec_probe; 2326 2326 2327 - snd_soc_component_disable_pin(component, "HAPTICS"); 2327 + snd_soc_dapm_disable_pin(dapm, "HAPTICS"); 2328 2328 2329 2329 return 0; 2330 2330