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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
cf393798 6ad9058c

+5 -5
+5 -5
sound/soc/codecs/rt5682.c
··· 928 928 static int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert) 929 929 { 930 930 struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component); 931 - struct snd_soc_dapm_context *dapm = &component->dapm; 931 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 932 932 unsigned int val, count; 933 933 934 934 if (jack_insert) { ··· 1115 1115 } 1116 1116 } 1117 1117 1118 - dapm = snd_soc_component_get_dapm(rt5682->component); 1118 + dapm = snd_soc_component_to_dapm(rt5682->component); 1119 1119 1120 1120 snd_soc_dapm_mutex_lock(dapm); 1121 1121 mutex_lock(&rt5682->calibrate_mutex); ··· 2595 2595 return -EINVAL; 2596 2596 2597 2597 component = rt5682->component; 2598 - dapm = snd_soc_component_get_dapm(component); 2598 + dapm = snd_soc_component_to_dapm(component); 2599 2599 2600 2600 snd_soc_dapm_mutex_lock(dapm); 2601 2601 ··· 2633 2633 return; 2634 2634 2635 2635 component = rt5682->component; 2636 - dapm = snd_soc_component_get_dapm(component); 2636 + dapm = snd_soc_component_to_dapm(component); 2637 2637 2638 2638 snd_soc_dapm_mutex_lock(dapm); 2639 2639 ··· 2928 2928 static int rt5682_probe(struct snd_soc_component *component) 2929 2929 { 2930 2930 struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component); 2931 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 2931 2932 struct sdw_slave *slave; 2932 2933 unsigned long time; 2933 - struct snd_soc_dapm_context *dapm = &component->dapm; 2934 2934 2935 2935 rt5682->component = component; 2936 2936