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

ASoC: codecs: lpass-wsa-macro: 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/878qgd5ser.wl-kuninori.morimoto.gx@renesas.com

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

parent 5328d3d6

sound/soc/codecs/lpass-wsa-macro.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -2186,8 +2186,7 @@ static int wsa_macro_ear_spkr_pa_gain_put(struct snd_kcontrol *kcontrol,
		static int wsa_macro_rx_mux_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		struct snd_soc_dapm_widget *widget =
		snd_soc_dapm_kcontrol_widget(kcontrol);
		struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
		struct snd_soc_component *component =
		snd_soc_dapm_to_component(widget->dapm);
		struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
		@@ -2200,8 +2199,7 @@ static int wsa_macro_rx_mux_get(struct snd_kcontrol *kcontrol,
		static int wsa_macro_rx_mux_put(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		struct snd_soc_dapm_widget *widget =
		snd_soc_dapm_kcontrol_widget(kcontrol);
		struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
		struct snd_soc_component *component =
		snd_soc_dapm_to_component(widget->dapm);
		struct soc_enum e = (struct soc_enum )kcontrol->private_value;
		@@ -2331,7 +2329,7 @@ static const struct snd_kcontrol_new rx_mux[WSA_MACRO_RX_MAX] = {
		static int wsa_macro_vi_feed_mixer_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_widget(kcontrol);
		struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
		struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm);
		struct soc_mixer_control mixer = (struct soc_mixer_control )kcontrol->private_value;
		struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
		@@ -2349,7 +2347,7 @@ static int wsa_macro_vi_feed_mixer_get(struct snd_kcontrol *kcontrol,
		static int wsa_macro_vi_feed_mixer_put(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_widget(kcontrol);
		struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
		struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm);
		struct soc_mixer_control mixer = (struct soc_mixer_control )kcontrol->private_value;
		struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
		@@ -2665,7 +2663,7 @@ static int wsa_swrm_clock(struct wsa_macro *wsa, bool enable)

		static int wsa_macro_component_probe(struct snd_soc_component *comp)
		{
		struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(comp);
		struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(comp);
		struct wsa_macro *wsa = snd_soc_component_get_drvdata(comp);
		const struct snd_soc_dapm_widget *widgets;
		unsigned int num_widgets;