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

index cab2f2eecdfba2cd755cbacc01c680c6f0f8dc8f..39bafefa6a1869164e281b59df1b637583043378 100644 (file)
@@ -402,7 +402,7 @@ static int idt821034_kctrl_gain_get(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
 {
        struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value;
-       struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+       struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
        struct idt821034 *idt821034 = snd_soc_component_get_drvdata(component);
        int min = mc->min;
        int max = mc->max;
@@ -433,7 +433,7 @@ static int idt821034_kctrl_gain_put(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
 {
        struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value;
-       struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+       struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
        struct idt821034 *idt821034 = snd_soc_component_get_drvdata(component);
        struct idt821034_amp *amp;
        int min = mc->min;
@@ -487,7 +487,7 @@ end:
 static int idt821034_kctrl_mute_get(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 idt821034 *idt821034 = snd_soc_component_get_drvdata(component);
        int id = kcontrol->private_value;
        bool is_muted;
@@ -509,7 +509,7 @@ static int idt821034_kctrl_mute_get(struct snd_kcontrol *kcontrol,
 static int idt821034_kctrl_mute_put(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 idt821034 *idt821034 = snd_soc_component_get_drvdata(component);
        int id = kcontrol->private_value;
        struct idt821034_amp *amp;