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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
6ef8e2f7 9c3c02de

+4 -3
+4 -3
sound/soc/codecs/max98090.c
··· 1469 1469 static int max98090_add_widgets(struct snd_soc_component *component) 1470 1470 { 1471 1471 struct max98090_priv *max98090 = snd_soc_component_get_drvdata(component); 1472 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 1472 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1473 1473 1474 1474 snd_soc_add_component_controls(component, max98090_snd_controls, 1475 1475 ARRAY_SIZE(max98090_snd_controls)); ··· 1751 1751 enum snd_soc_bias_level level) 1752 1752 { 1753 1753 struct max98090_priv *max98090 = snd_soc_component_get_drvdata(component); 1754 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1754 1755 int ret; 1755 1756 1756 1757 switch (level) { ··· 1769 1768 if (IS_ERR(max98090->mclk)) 1770 1769 break; 1771 1770 1772 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON) { 1771 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_ON) { 1773 1772 clk_disable_unprepare(max98090->mclk); 1774 1773 } else { 1775 1774 ret = clk_prepare_enable(max98090->mclk); ··· 1779 1778 break; 1780 1779 1781 1780 case SND_SOC_BIAS_STANDBY: 1782 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 1781 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 1783 1782 ret = regcache_sync(max98090->regmap); 1784 1783 if (ret != 0) { 1785 1784 dev_err(component->dev,