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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
0c933ede ee4ac04e

+2 -2
+2 -2
sound/soc/codecs/max9768.c
··· 40 40 static int max9768_get_gpio(struct snd_kcontrol *kcontrol, 41 41 struct snd_ctl_elem_value *ucontrol) 42 42 { 43 - struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol); 43 + struct snd_soc_component *c = snd_kcontrol_chip(kcontrol); 44 44 struct max9768 *max9768 = snd_soc_component_get_drvdata(c); 45 45 int val = gpiod_get_value_cansleep(max9768->mute); 46 46 ··· 52 52 static int max9768_set_gpio(struct snd_kcontrol *kcontrol, 53 53 struct snd_ctl_elem_value *ucontrol) 54 54 { 55 - struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol); 55 + struct snd_soc_component *c = snd_kcontrol_chip(kcontrol); 56 56 struct max9768 *max9768 = snd_soc_component_get_drvdata(c); 57 57 bool val = !ucontrol->value.integer.value[0]; 58 58 int ret;