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

ASoC: codecs: rt5665: 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/87347mqffq.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
2c688df0 09b29035

+2 -2
+2 -2
sound/soc/codecs/rt5665.c
··· 993 993 static int rt5665_hp_vol_put(struct snd_kcontrol *kcontrol, 994 994 struct snd_ctl_elem_value *ucontrol) 995 995 { 996 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 996 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 997 997 int ret = snd_soc_put_volsw(kcontrol, ucontrol); 998 998 999 999 if (snd_soc_component_read(component, RT5665_STO_NG2_CTRL_1) & RT5665_NG2_EN) { ··· 1009 1009 static int rt5665_mono_vol_put(struct snd_kcontrol *kcontrol, 1010 1010 struct snd_ctl_elem_value *ucontrol) 1011 1011 { 1012 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 1012 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 1013 1013 int ret = snd_soc_put_volsw(kcontrol, ucontrol); 1014 1014 1015 1015 if (snd_soc_component_read(component, RT5665_MONO_NG2_CTRL_1) & RT5665_NG2_EN) {