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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
c2b942fb 7d6ca6db

+5 -3
+5 -3
sound/soc/codecs/rt286.c
··· 223 223 if (!rt286->component) 224 224 return -EINVAL; 225 225 226 - dapm = snd_soc_component_get_dapm(rt286->component); 226 + dapm = snd_soc_component_to_dapm(rt286->component); 227 227 228 228 if (rt286->pdata.cbj_en) { 229 229 regmap_read(rt286->regmap, RT286_GET_HP_SENSE, &buf); ··· 314 314 static int rt286_mic_detect(struct snd_soc_component *component, 315 315 struct snd_soc_jack *jack, void *data) 316 316 { 317 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 317 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 318 318 struct rt286_priv *rt286 = snd_soc_component_get_drvdata(component); 319 319 320 320 rt286->jack = jack; ··· 887 887 static int rt286_set_bias_level(struct snd_soc_component *component, 888 888 enum snd_soc_bias_level level) 889 889 { 890 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 891 + 890 892 switch (level) { 891 893 case SND_SOC_BIAS_PREPARE: 892 - if (SND_SOC_BIAS_STANDBY == snd_soc_component_get_bias_level(component)) { 894 + if (SND_SOC_BIAS_STANDBY == snd_soc_dapm_get_bias_level(dapm)) { 893 895 snd_soc_component_write(component, 894 896 RT286_SET_AUDIO_POWER, AC_PWRST_D0); 895 897 snd_soc_component_update_bits(component,