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

ASoC: codecs: adau7118: 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: Nuno Sá <nuno.sa@analog.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/87ikfh8lr2.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
31f28cda bdd43845

+3 -4
+3 -4
sound/soc/codecs/adau7118.c
··· 335 335 enum snd_soc_bias_level level) 336 336 { 337 337 struct adau7118_data *st = snd_soc_component_get_drvdata(component); 338 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 338 339 int ret = 0; 339 340 340 341 dev_dbg(st->dev, "Set bias level %d\n", level); ··· 346 345 break; 347 346 348 347 case SND_SOC_BIAS_STANDBY: 349 - if (snd_soc_component_get_bias_level(component) == 350 - SND_SOC_BIAS_OFF) { 348 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 351 349 /* power on */ 352 350 ret = regulator_enable(st->iovdd); 353 351 if (ret) ··· 393 393 static int adau7118_component_probe(struct snd_soc_component *component) 394 394 { 395 395 struct adau7118_data *st = snd_soc_component_get_drvdata(component); 396 - struct snd_soc_dapm_context *dapm = 397 - snd_soc_component_get_dapm(component); 396 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 398 397 int ret = 0; 399 398 400 399 if (st->hw_mode) {