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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
8f1d72f8 e6211161

+2 -2
+2 -2
sound/soc/codecs/cs42l84.c
··· 84 84 static int cs42l84_put_dac_vol(struct snd_kcontrol *kctl, 85 85 struct snd_ctl_elem_value *val) 86 86 { 87 - struct snd_soc_component *component = snd_soc_kcontrol_component(kctl); 87 + struct snd_soc_component *component = snd_kcontrol_chip(kctl); 88 88 struct soc_mixer_control *mc = (struct soc_mixer_control *) kctl->private_value; 89 89 int vola, volb; 90 90 int ret, ret2, updated = 0; ··· 138 138 static int cs42l84_get_dac_vol(struct snd_kcontrol *kctl, 139 139 struct snd_ctl_elem_value *val) 140 140 { 141 - struct snd_soc_component *component = snd_soc_kcontrol_component(kctl); 141 + struct snd_soc_component *component = snd_kcontrol_chip(kctl); 142 142 struct soc_mixer_control *mc = (struct soc_mixer_control *) kctl->private_value; 143 143 int vola, volb; 144 144 int ret;