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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
ce99b1dd 80ac2205

+3 -2
+3 -2
sound/soc/codecs/cs47l85.c
··· 2497 2497 2498 2498 static int cs47l85_component_probe(struct snd_soc_component *component) 2499 2499 { 2500 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 2500 2501 struct cs47l85 *cs47l85 = snd_soc_component_get_drvdata(component); 2501 2502 struct madera *madera = cs47l85->core.madera; 2502 2503 int i, ret; ··· 2505 2504 snd_soc_component_init_regmap(component, madera->regmap); 2506 2505 2507 2506 mutex_lock(&madera->dapm_ptr_lock); 2508 - madera->dapm = snd_soc_component_get_dapm(component); 2507 + madera->dapm = snd_soc_component_to_dapm(component); 2509 2508 mutex_unlock(&madera->dapm_ptr_lock); 2510 2509 2511 2510 ret = madera_init_inputs(component); ··· 2517 2516 if (ret) 2518 2517 return ret; 2519 2518 2520 - snd_soc_component_disable_pin(component, "HAPTICS"); 2519 + snd_soc_dapm_disable_pin(dapm, "HAPTICS"); 2521 2520 2522 2521 ret = snd_soc_add_component_controls(component, 2523 2522 madera_adsp_rate_controls,