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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
da9ad75a 3f553ac8

+3 -2
+3 -2
sound/soc/codecs/wm8731.c
··· 362 362 int clk_id, unsigned int freq, int dir) 363 363 { 364 364 struct snd_soc_component *component = codec_dai->component; 365 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 365 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 366 366 struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(component); 367 367 368 368 switch (clk_id) { ··· 465 465 enum snd_soc_bias_level level) 466 466 { 467 467 struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(component); 468 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 468 469 int ret; 469 470 u16 reg; 470 471 ··· 480 479 case SND_SOC_BIAS_PREPARE: 481 480 break; 482 481 case SND_SOC_BIAS_STANDBY: 483 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 482 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 484 483 ret = regulator_bulk_enable(ARRAY_SIZE(wm8731->supplies), 485 484 wm8731->supplies); 486 485 if (ret != 0)