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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
6c8f8e79 f4ae2720

+4 -4
+4 -4
sound/soc/codecs/wm2000.c
··· 598 598 static int wm2000_anc_mode_get(struct snd_kcontrol *kcontrol, 599 599 struct snd_ctl_elem_value *ucontrol) 600 600 { 601 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 601 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 602 602 struct wm2000_priv *wm2000 = dev_get_drvdata(component->dev); 603 603 604 604 ucontrol->value.integer.value[0] = wm2000->anc_active; ··· 609 609 static int wm2000_anc_mode_put(struct snd_kcontrol *kcontrol, 610 610 struct snd_ctl_elem_value *ucontrol) 611 611 { 612 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 612 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 613 613 struct wm2000_priv *wm2000 = dev_get_drvdata(component->dev); 614 614 unsigned int anc_active = ucontrol->value.integer.value[0]; 615 615 int ret; ··· 631 631 static int wm2000_speaker_get(struct snd_kcontrol *kcontrol, 632 632 struct snd_ctl_elem_value *ucontrol) 633 633 { 634 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 634 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 635 635 struct wm2000_priv *wm2000 = dev_get_drvdata(component->dev); 636 636 637 637 ucontrol->value.integer.value[0] = wm2000->spk_ena; ··· 642 642 static int wm2000_speaker_put(struct snd_kcontrol *kcontrol, 643 643 struct snd_ctl_elem_value *ucontrol) 644 644 { 645 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 645 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 646 646 struct wm2000_priv *wm2000 = dev_get_drvdata(component->dev); 647 647 unsigned int val = ucontrol->value.integer.value[0]; 648 648 int ret;