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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
12223b45 0a87517a

+3 -2
+3 -2
sound/soc/codecs/da7218.c
··· 2562 2562 enum snd_soc_bias_level level) 2563 2563 { 2564 2564 struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component); 2565 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 2565 2566 int ret; 2566 2567 2567 2568 switch (level) { ··· 2570 2569 break; 2571 2570 case SND_SOC_BIAS_PREPARE: 2572 2571 /* Enable MCLK for transition to ON state */ 2573 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_STANDBY) { 2572 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_STANDBY) { 2574 2573 if (da7218->mclk) { 2575 2574 ret = clk_prepare_enable(da7218->mclk); 2576 2575 if (ret) { ··· 2582 2581 2583 2582 break; 2584 2583 case SND_SOC_BIAS_STANDBY: 2585 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 2584 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 2586 2585 /* Master bias */ 2587 2586 snd_soc_component_update_bits(component, DA7218_REFERENCES, 2588 2587 DA7218_BIAS_EN_MASK,