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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
84544353 664ae393

+4 -2
+4 -2
sound/soc/codecs/sta32x.c
··· 799 799 { 800 800 int ret; 801 801 struct sta32x_priv *sta32x = snd_soc_component_get_drvdata(component); 802 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 802 803 803 804 dev_dbg(component->dev, "level = %d\n", level); 804 805 switch (level) { ··· 814 813 break; 815 814 816 815 case SND_SOC_BIAS_STANDBY: 817 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 816 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 818 817 ret = regulator_bulk_enable(ARRAY_SIZE(sta32x->supplies), 819 818 sta32x->supplies); 820 819 if (ret != 0) { ··· 871 870 872 871 static int sta32x_probe(struct snd_soc_component *component) 873 872 { 873 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 874 874 struct sta32x_priv *sta32x = snd_soc_component_get_drvdata(component); 875 875 struct sta32x_platform_data *pdata = sta32x->pdata; 876 876 int i, ret = 0, thermal = 0; ··· 976 974 if (sta32x->pdata->needs_esd_watchdog) 977 975 INIT_DELAYED_WORK(&sta32x->watchdog_work, sta32x_watchdog); 978 976 979 - snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY); 977 + snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_STANDBY); 980 978 /* Bias level configuration will have done an extra enable */ 981 979 regulator_bulk_disable(ARRAY_SIZE(sta32x->supplies), sta32x->supplies); 982 980