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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
09b29035 2191593d

+1 -1
+1 -1
sound/soc/codecs/rt5659.c
··· 1197 1197 static int rt5659_hp_vol_put(struct snd_kcontrol *kcontrol, 1198 1198 struct snd_ctl_elem_value *ucontrol) 1199 1199 { 1200 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 1200 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 1201 1201 int ret = snd_soc_put_volsw(kcontrol, ucontrol); 1202 1202 1203 1203 if (snd_soc_component_read(component, RT5659_STO_NG2_CTRL_1) & RT5659_NG2_EN) {