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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
2cc32597 fef5517f

+3 -2
+3 -2
sound/soc/codecs/wm9090.c
··· 409 409 static int wm9090_add_controls(struct snd_soc_component *component) 410 410 { 411 411 struct wm9090_priv *wm9090 = snd_soc_component_get_drvdata(component); 412 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 412 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 413 413 int i; 414 414 415 415 snd_soc_dapm_new_controls(dapm, wm9090_dapm_widgets, ··· 463 463 enum snd_soc_bias_level level) 464 464 { 465 465 struct wm9090_priv *wm9090 = snd_soc_component_get_drvdata(component); 466 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 466 467 467 468 switch (level) { 468 469 case SND_SOC_BIAS_ON: ··· 481 480 break; 482 481 483 482 case SND_SOC_BIAS_STANDBY: 484 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 483 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 485 484 /* Restore the register cache */ 486 485 regcache_sync(wm9090->regmap); 487 486 }