Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: codecs: rt711-sdca: use snd_kcontrol_chip() instead of snd_soc_kcontrol_component()

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/87zf9up0v3.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
d7e13998 6047387a

+2 -2
+2 -2
sound/soc/codecs/rt711-sdca.c
··· 813 813 struct snd_ctl_elem_value *ucontrol) 814 814 { 815 815 struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; 816 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 816 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 817 817 struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component); 818 818 unsigned int val, item; 819 819 ··· 828 828 { 829 829 struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; 830 830 unsigned int *item = ucontrol->value.enumerated.item; 831 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 831 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 832 832 struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component); 833 833 unsigned int val, change = 0; 834 834