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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
04b80a9a da9ad75a

+4 -2
+4 -2
sound/soc/codecs/wm8737.c
··· 452 452 enum snd_soc_bias_level level) 453 453 { 454 454 struct wm8737_priv *wm8737 = snd_soc_component_get_drvdata(component); 455 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 455 456 int ret; 456 457 457 458 switch (level) { ··· 466 465 break; 467 466 468 467 case SND_SOC_BIAS_STANDBY: 469 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 468 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 470 469 ret = regulator_bulk_enable(ARRAY_SIZE(wm8737->supplies), 471 470 wm8737->supplies); 472 471 if (ret != 0) { ··· 538 537 static int wm8737_probe(struct snd_soc_component *component) 539 538 { 540 539 struct wm8737_priv *wm8737 = snd_soc_component_get_drvdata(component); 540 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 541 541 int ret; 542 542 543 543 ret = regulator_bulk_enable(ARRAY_SIZE(wm8737->supplies), ··· 559 557 snd_soc_component_update_bits(component, WM8737_RIGHT_PGA_VOLUME, WM8737_RVU, 560 558 WM8737_RVU); 561 559 562 - snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY); 560 + snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_STANDBY); 563 561 564 562 /* Bias level configuration will have done an extra enable */ 565 563 regulator_bulk_disable(ARRAY_SIZE(wm8737->supplies), wm8737->supplies);