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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
3eca632e 8000e233

+5 -5
+5 -5
sound/soc/codecs/nau8824.c
··· 876 876 NAU8824_JD_SLEEP_MODE, NAU8824_JD_SLEEP_MODE); 877 877 878 878 /* Close clock for jack type detection at manual mode */ 879 - if (dapm->bias_level < SND_SOC_BIAS_PREPARE) 879 + if (snd_soc_dapm_get_bias_level(dapm) < SND_SOC_BIAS_PREPARE) 880 880 nau8824_config_sysclk(nau8824, NAU8824_CLK_DIS, 0); 881 881 } 882 882 ··· 931 931 regmap_update_bits(regmap, NAU8824_REG_INTERRUPT_SETTING, 932 932 NAU8824_IRQ_EJECT_DIS, 0); 933 933 /* Enable internal VCO needed for interruptions */ 934 - if (nau8824->dapm->bias_level < SND_SOC_BIAS_PREPARE) 934 + if (snd_soc_dapm_get_bias_level(nau8824->dapm) < SND_SOC_BIAS_PREPARE) 935 935 nau8824_config_sysclk(nau8824, NAU8824_CLK_INTERNAL, 0); 936 936 regmap_update_bits(regmap, NAU8824_REG_ENA_CTRL, 937 937 NAU8824_JD_SLEEP_MODE, 0); ··· 1498 1498 break; 1499 1499 1500 1500 case SND_SOC_BIAS_STANDBY: 1501 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 1501 + if (snd_soc_dapm_get_bias_level(nau8824->dapm) == SND_SOC_BIAS_OFF) { 1502 1502 /* Setup codec configuration after resume */ 1503 1503 nau8824_resume_setup(nau8824); 1504 1504 } ··· 1519 1519 static int nau8824_component_probe(struct snd_soc_component *component) 1520 1520 { 1521 1521 struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); 1522 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 1522 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1523 1523 1524 1524 nau8824->dapm = dapm; 1525 1525 ··· 1532 1532 1533 1533 if (nau8824->irq) { 1534 1534 disable_irq(nau8824->irq); 1535 - snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF); 1535 + snd_soc_dapm_force_bias_level(nau8824->dapm, SND_SOC_BIAS_OFF); 1536 1536 } 1537 1537 regcache_cache_only(nau8824->regmap, true); 1538 1538 regcache_mark_dirty(nau8824->regmap);