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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
3a071bb3 14af3d3c

+2 -2
+2 -2
sound/soc/codecs/ntp8835.c
··· 92 92 static int ntp8835_mute_get(struct snd_kcontrol *kcontrol, 93 93 struct snd_ctl_elem_value *ucontrol) 94 94 { 95 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 95 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 96 96 unsigned int val; 97 97 98 98 val = snd_soc_component_read(component, NTP8835_SOFT_MUTE); ··· 104 104 static int ntp8835_mute_put(struct snd_kcontrol *kcontrol, 105 105 struct snd_ctl_elem_value *ucontrol) 106 106 { 107 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 107 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 108 108 unsigned int val; 109 109 110 110 val = ucontrol->value.integer.value[0] ? 0 : 7;