]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: codecs: msm8916-wcd-digital: use snd_kcontrol_chip() instead of snd_soc_kcontro...
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 14 Oct 2025 04:22:47 +0000 (04:22 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 20 Oct 2025 01:43:07 +0000 (02:43 +0100)
We have very similar name functions (A)(B). Both gets component from
snd_kcontrol, but (A) is used in callback functions which is registered
through snd_soc_add_component_controls(), (B) is used through
snd_soc_dapm_new_widgets().

(A) snd_soc_kcontrol_component()
(B) snd_soc_dapm_kcontrol_component()

(B) is using very picky way to get component but using it is necessary in
ASoC. But (A) is just wrapper function to snd_kcontrol_chip(), and directly
using it without wrapper is very common way on ALSA.
To reduce confusions of similar function, let's use common way on (A).

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87qzv6qfhl.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/msm8916-wcd-digital.c

index ebb6f2e8481828f587729b01398c05aa02f2476b..cfadea2aa1f7e8a69525c1afedffbba305598233 100644 (file)
@@ -423,8 +423,7 @@ static int msm8x16_wcd_get_iir_band_audio_mixer(
                                        struct snd_ctl_elem_value *ucontrol)
 {
 
-       struct snd_soc_component *component =
-                       snd_soc_kcontrol_component(kcontrol);
+       struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
        struct wcd_iir_filter_ctl *ctl =
                        (struct wcd_iir_filter_ctl *)kcontrol->private_value;
        struct soc_bytes_ext *params = &ctl->bytes_ext;
@@ -469,8 +468,7 @@ static int msm8x16_wcd_put_iir_band_audio_mixer(
                                        struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_component *component =
-                       snd_soc_kcontrol_component(kcontrol);
+       struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
        struct wcd_iir_filter_ctl *ctl =
                        (struct wcd_iir_filter_ctl *)kcontrol->private_value;
        struct soc_bytes_ext *params = &ctl->bytes_ext;