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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
1a1a66c2 161e3c82

+2 -2
+2 -2
sound/soc/codecs/wm8955.c
··· 387 387 static int wm8955_get_deemph(struct snd_kcontrol *kcontrol, 388 388 struct snd_ctl_elem_value *ucontrol) 389 389 { 390 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 390 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 391 391 struct wm8955_priv *wm8955 = snd_soc_component_get_drvdata(component); 392 392 393 393 ucontrol->value.integer.value[0] = wm8955->deemph; ··· 397 397 static int wm8955_put_deemph(struct snd_kcontrol *kcontrol, 398 398 struct snd_ctl_elem_value *ucontrol) 399 399 { 400 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 400 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 401 401 struct wm8955_priv *wm8955 = snd_soc_component_get_drvdata(component); 402 402 unsigned int deemph = ucontrol->value.integer.value[0]; 403 403