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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
e727c8d0 cf393798

+3 -2
+3 -2
sound/soc/codecs/rt5682s.c
··· 841 841 return; 842 842 } 843 843 844 - dapm = snd_soc_component_get_dapm(rt5682s->component); 844 + dapm = snd_soc_component_to_dapm(rt5682s->component); 845 845 846 846 snd_soc_dapm_mutex_lock(dapm); 847 847 mutex_lock(&rt5682s->calibrate_mutex); ··· 2485 2485 enum snd_soc_bias_level level) 2486 2486 { 2487 2487 struct rt5682s_priv *rt5682s = snd_soc_component_get_drvdata(component); 2488 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 2488 2489 2489 2490 switch (level) { 2490 2491 case SND_SOC_BIAS_PREPARE: ··· 2493 2492 RT5682S_PWR_LDO, RT5682S_PWR_LDO); 2494 2493 break; 2495 2494 case SND_SOC_BIAS_STANDBY: 2496 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) 2495 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) 2497 2496 regmap_update_bits(rt5682s->regmap, RT5682S_PWR_DIG_1, 2498 2497 RT5682S_DIG_GATE_CTRL, RT5682S_DIG_GATE_CTRL); 2499 2498 break;