]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: codecs: fs210x: use snd_kcontrol_chip() instead of snd_soc_kcontrol_component()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 14 Oct 2025 04:21:51 +0000 (04:21 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 20 Oct 2025 01:42:51 +0000 (02:42 +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/87cy6qru3m.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/fs210x.c

index e2f85714972d559f33006dffc8f25cf16b849aac..e6195b71adadcc7b40065e3cc711b469e5e9bcad 100644 (file)
@@ -924,7 +924,7 @@ static int fs210x_get_drvdata_from_kctrl(struct snd_kcontrol *kctrl,
                return -EINVAL;
        }
 
-       cmpnt = snd_soc_kcontrol_component(kctrl);
+       cmpnt = snd_kcontrol_chip(kctrl);
        if (!cmpnt) {
                pr_err("fs210x: component is null\n");
                return -EINVAL;