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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
ab7963a3 cffb8638

+4 -2
+4 -2
sound/soc/codecs/rt5631.c
··· 1535 1535 enum snd_soc_bias_level level) 1536 1536 { 1537 1537 struct rt5631_priv *rt5631 = snd_soc_component_get_drvdata(component); 1538 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1538 1539 1539 1540 switch (level) { 1540 1541 case SND_SOC_BIAS_ON: ··· 1546 1545 break; 1547 1546 1548 1547 case SND_SOC_BIAS_STANDBY: 1549 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 1548 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 1550 1549 snd_soc_component_update_bits(component, RT5631_PWR_MANAG_ADD3, 1551 1550 RT5631_PWR_VREF | RT5631_PWR_MAIN_BIAS, 1552 1551 RT5631_PWR_VREF | RT5631_PWR_MAIN_BIAS); ··· 1576 1575 static int rt5631_probe(struct snd_soc_component *component) 1577 1576 { 1578 1577 struct rt5631_priv *rt5631 = snd_soc_component_get_drvdata(component); 1578 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1579 1579 unsigned int val; 1580 1580 1581 1581 val = rt5631_read_index(component, RT5631_ADDA_MIXER_INTL_REG3); ··· 1615 1613 RT5631_DMIC_R_CH_LATCH_RISING); 1616 1614 } 1617 1615 1618 - snd_soc_component_init_bias_level(component, SND_SOC_BIAS_STANDBY); 1616 + snd_soc_dapm_init_bias_level(dapm, SND_SOC_BIAS_STANDBY); 1619 1617 1620 1618 return 0; 1621 1619 }