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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
11c256c4 c2b942fb

+5 -4
+5 -4
sound/soc/codecs/rt298.c
··· 227 227 if (!rt298->component) 228 228 return -EINVAL; 229 229 230 - dapm = snd_soc_component_get_dapm(rt298->component); 230 + dapm = snd_soc_component_to_dapm(rt298->component); 231 231 232 232 if (rt298->pdata.cbj_en) { 233 233 regmap_read(rt298->regmap, RT298_GET_HP_SENSE, &buf); ··· 329 329 static int rt298_mic_detect(struct snd_soc_component *component, 330 330 struct snd_soc_jack *jack, void *data) 331 331 { 332 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 332 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 333 333 struct rt298_priv *rt298 = snd_soc_component_get_drvdata(component); 334 334 335 335 rt298->jack = jack; ··· 949 949 static int rt298_set_bias_level(struct snd_soc_component *component, 950 950 enum snd_soc_bias_level level) 951 951 { 952 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 953 + 952 954 switch (level) { 953 955 case SND_SOC_BIAS_PREPARE: 954 - if (SND_SOC_BIAS_STANDBY == 955 - snd_soc_component_get_bias_level(component)) { 956 + if (SND_SOC_BIAS_STANDBY == snd_soc_dapm_get_bias_level(dapm)) { 956 957 snd_soc_component_write(component, 957 958 RT298_SET_AUDIO_POWER, AC_PWRST_D0); 958 959 snd_soc_component_update_bits(component, 0x0d, 0x200, 0x200);