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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
aaf1f90c 12223b45

+5 -5
+5 -5
sound/soc/codecs/da7219-aad.c
··· 53 53 struct da7219_aad_priv *da7219_aad = 54 54 container_of(work, struct da7219_aad_priv, btn_det_work); 55 55 struct snd_soc_component *component = da7219_aad->component; 56 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 56 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 57 57 struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component); 58 58 u8 statusa, micbias_ctrl; 59 59 bool micbias_up = false; ··· 109 109 struct da7219_aad_priv *da7219_aad = 110 110 container_of(work, struct da7219_aad_priv, hptest_work); 111 111 struct snd_soc_component *component = da7219_aad->component; 112 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 112 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 113 113 struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component); 114 114 115 115 __le16 tonegen_freq_hptest; ··· 351 351 { 352 352 struct da7219_aad_priv *da7219_aad = data; 353 353 struct snd_soc_component *component = da7219_aad->component; 354 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 354 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 355 355 struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component); 356 356 u8 events[DA7219_AAD_IRQ_REG_MAX]; 357 357 u8 statusa; ··· 928 928 { 929 929 struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component); 930 930 struct da7219_aad_priv *da7219_aad = da7219->aad; 931 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 931 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 932 932 u8 micbias_ctrl; 933 933 934 934 disable_irq(da7219_aad->irq); ··· 962 962 { 963 963 struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component); 964 964 struct da7219_aad_priv *da7219_aad = da7219->aad; 965 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 965 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 966 966 967 967 if (da7219_aad->jack) { 968 968 /* Re-enable micbias if previously enabled for 4-pole jack */