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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
9bcc76f5 60b6a547

+5 -4
+5 -4
sound/soc/codecs/rt5670.c
··· 431 431 static int rt5670_headset_detect(struct snd_soc_component *component, int jack_insert) 432 432 { 433 433 int val; 434 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 434 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 435 435 struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component); 436 436 437 437 if (jack_insert) { ··· 966 966 struct snd_ctl_elem_value *ucontrol) 967 967 { 968 968 struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; 969 - struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol); 969 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 970 970 struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component); 971 971 int ret; 972 972 ··· 2670 2670 enum snd_soc_bias_level level) 2671 2671 { 2672 2672 struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component); 2673 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 2673 2674 2674 2675 switch (level) { 2675 2676 case SND_SOC_BIAS_PREPARE: 2676 - if (SND_SOC_BIAS_STANDBY == snd_soc_component_get_bias_level(component)) { 2677 + if (SND_SOC_BIAS_STANDBY == snd_soc_dapm_get_bias_level(dapm)) { 2677 2678 snd_soc_component_update_bits(component, RT5670_PWR_ANLG1, 2678 2679 RT5670_PWR_VREF1 | RT5670_PWR_MB | 2679 2680 RT5670_PWR_BG | RT5670_PWR_VREF2, ··· 2724 2723 2725 2724 static int rt5670_probe(struct snd_soc_component *component) 2726 2725 { 2727 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 2726 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 2728 2727 struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component); 2729 2728 2730 2729 switch (snd_soc_component_read(component, RT5670_RESET) & RT5670_ID_MASK) {