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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
3f284840 5b08edab

+5 -4
+5 -4
sound/soc/codecs/wm8904.c
··· 1246 1246 static int wm8904_add_widgets(struct snd_soc_component *component) 1247 1247 { 1248 1248 struct wm8904_priv *wm8904 = snd_soc_component_get_drvdata(component); 1249 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 1249 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1250 1250 1251 1251 snd_soc_dapm_new_controls(dapm, wm8904_core_dapm_widgets, 1252 1252 ARRAY_SIZE(wm8904_core_dapm_widgets)); ··· 1934 1934 enum snd_soc_bias_level level) 1935 1935 { 1936 1936 struct wm8904_priv *wm8904 = snd_soc_component_get_drvdata(component); 1937 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1937 1938 int ret; 1938 1939 1939 1940 switch (level) { ··· 1953 1952 break; 1954 1953 1955 1954 case SND_SOC_BIAS_STANDBY: 1956 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 1955 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 1957 1956 ret = regulator_bulk_enable(ARRAY_SIZE(wm8904->supplies), 1958 1957 wm8904->supplies); 1959 1958 if (ret != 0) { ··· 2115 2114 2116 2115 static void wm8904_handle_dmic_pdata(struct snd_soc_component *component) 2117 2116 { 2118 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 2117 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 2119 2118 struct wm8904_priv *wm8904 = snd_soc_component_get_drvdata(component); 2120 2119 struct wm8904_pdata *pdata = wm8904->pdata; 2121 2120 unsigned int dmic_src; ··· 2162 2161 2163 2162 static void wm8904_handle_pdata(struct snd_soc_component *component) 2164 2163 { 2165 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 2164 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 2166 2165 struct wm8904_priv *wm8904 = snd_soc_component_get_drvdata(component); 2167 2166 struct wm8904_pdata *pdata = wm8904->pdata; 2168 2167 int ret, i;