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

Configure Feed

Select the types of activity you want to include in your feed.

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

authored by

Kuninori Morimoto and committed by
Mark Brown 041e502d be2b723d

+8 -10
+8 -10
sound/soc/codecs/arizona.c
··· 169 169 170 170 int arizona_init_spk(struct snd_soc_component *component) 171 171 { 172 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 172 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 173 173 struct arizona_priv *priv = snd_soc_component_get_drvdata(component); 174 174 struct arizona *arizona = priv->arizona; 175 175 int ret; ··· 238 238 239 239 int arizona_init_mono(struct snd_soc_component *component) 240 240 { 241 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 241 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 242 242 struct arizona_priv *priv = snd_soc_component_get_drvdata(component); 243 243 struct arizona *arizona = priv->arizona; 244 244 int i; ··· 255 255 256 256 int arizona_init_gpio(struct snd_soc_component *component) 257 257 { 258 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 258 259 struct arizona_priv *priv = snd_soc_component_get_drvdata(component); 259 260 struct arizona *arizona = priv->arizona; 260 261 int i; ··· 263 262 switch (arizona->type) { 264 263 case WM5110: 265 264 case WM8280: 266 - snd_soc_component_disable_pin(component, 267 - "DRC2 Signal Activity"); 265 + snd_soc_dapm_disable_pin(dapm, "DRC2 Signal Activity"); 268 266 break; 269 267 default: 270 268 break; 271 269 } 272 270 273 - snd_soc_component_disable_pin(component, "DRC1 Signal Activity"); 271 + snd_soc_dapm_disable_pin(dapm, "DRC1 Signal Activity"); 274 272 275 273 for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) { 276 274 switch (arizona->pdata.gpio_defaults[i] & ARIZONA_GPN_FN_MASK) { 277 275 case ARIZONA_GP_FN_DRC1_SIGNAL_DETECT: 278 - snd_soc_component_enable_pin(component, 279 - "DRC1 Signal Activity"); 276 + snd_soc_dapm_enable_pin(dapm, "DRC1 Signal Activity"); 280 277 break; 281 278 case ARIZONA_GP_FN_DRC2_SIGNAL_DETECT: 282 - snd_soc_component_enable_pin(component, 283 - "DRC2 Signal Activity"); 279 + snd_soc_dapm_enable_pin(dapm, "DRC2 Signal Activity"); 284 280 break; 285 281 default: 286 282 break; ··· 1909 1911 int clk_id, unsigned int freq, int dir) 1910 1912 { 1911 1913 struct snd_soc_component *component = dai->component; 1912 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 1914 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1913 1915 struct arizona_priv *priv = snd_soc_component_get_drvdata(component); 1914 1916 struct arizona_dai_priv *dai_priv = &priv->dai[dai->id - 1]; 1915 1917 struct snd_soc_dapm_route routes[2];