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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
a5a6abd0 3f284840

+4 -2
+4 -2
sound/soc/codecs/wm8940.c
··· 476 476 enum snd_soc_bias_level level) 477 477 { 478 478 struct wm8940_priv *wm8940 = snd_soc_component_get_drvdata(component); 479 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 479 480 u16 val; 480 481 u16 pwr_reg = snd_soc_component_read(component, WM8940_POWER1) & 0x1F0; 481 482 int ret = 0; ··· 499 498 ret = snd_soc_component_write(component, WM8940_POWER1, pwr_reg | 0x1); 500 499 break; 501 500 case SND_SOC_BIAS_STANDBY: 502 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 501 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 503 502 ret = regcache_sync(wm8940->regmap); 504 503 if (ret < 0) { 505 504 dev_err(component->dev, "Failed to sync cache: %d\n", ret); ··· 762 761 763 762 static int wm8940_probe(struct snd_soc_component *component) 764 763 { 764 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 765 765 struct wm8940_setup_data *pdata = component->dev->platform_data; 766 766 int ret; 767 767 u16 reg; ··· 784 782 return ret; 785 783 } 786 784 787 - snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY); 785 + snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_STANDBY); 788 786 789 787 ret = snd_soc_component_write(component, WM8940_POWER1, 0x180); 790 788 if (ret < 0)