Unverified Commit 8000e233 authored Nov 11, 2025 by Kuninori Morimoto Committed by Mark Brown Nov 17, 2025

ASoC: codecs: nau8822: 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/87ldkd4dsp.wl-kuninori.morimoto.gx@renesas.com

Signed-off-by: Mark Brown <broonie@kernel.org>

parent 0314d787

sound/soc/codecs/nau8822.c

+8 −6

Original line number	Diff line number	Diff line
		@@ -957,6 +957,7 @@ static int nau8822_set_bias_level(struct snd_soc_component *component,
		enum snd_soc_bias_level level)
		{
		struct nau8822 *nau8822 = snd_soc_component_get_drvdata(component);
		struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);

		switch (level) {
		case SND_SOC_BIAS_ON:
		@@ -964,7 +965,7 @@ static int nau8822_set_bias_level(struct snd_soc_component *component,

		case SND_SOC_BIAS_PREPARE:
		if (nau8822->mclk &&
		snd_soc_component_get_bias_level(component) != SND_SOC_BIAS_ON) {
		snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_ON) {
		int ret = clk_prepare_enable(nau8822->mclk);

		if (ret) {
		@@ -981,7 +982,7 @@ static int nau8822_set_bias_level(struct snd_soc_component *component,

		case SND_SOC_BIAS_STANDBY:
		if (nau8822->mclk &&
		snd_soc_component_get_bias_level(component) != SND_SOC_BIAS_OFF)
		snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_OFF)
		clk_disable_unprepare(nau8822->mclk);

		snd_soc_component_update_bits(component,
		@@ -989,8 +990,7 @@ static int nau8822_set_bias_level(struct snd_soc_component *component,
		NAU8822_IOBUF_EN \| NAU8822_ABIAS_EN,
		NAU8822_IOBUF_EN \| NAU8822_ABIAS_EN);

		if (snd_soc_component_get_bias_level(component) ==
		SND_SOC_BIAS_OFF) {
		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
		snd_soc_component_update_bits(component,
		NAU8822_REG_POWER_MANAGEMENT_1,
		NAU8822_REFIMP_MASK, NAU8822_REFIMP_3K);
		@@ -1053,8 +1053,9 @@ static struct snd_soc_dai_driver nau8822_dai = {
		static int nau8822_suspend(struct snd_soc_component *component)
		{
		struct nau8822 *nau8822 = snd_soc_component_get_drvdata(component);
		struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);

		snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
		snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_OFF);

		regcache_mark_dirty(nau8822->regmap);

		@@ -1064,10 +1065,11 @@ static int nau8822_suspend(struct snd_soc_component *component)
		static int nau8822_resume(struct snd_soc_component *component)
		{
		struct nau8822 *nau8822 = snd_soc_component_get_drvdata(component);
		struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);

		regcache_sync(nau8822->regmap);

		snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY);
		snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_STANDBY);

		return 0;
		}