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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
6047387a 2c688df0

+2 -2
+2 -2
sound/soc/codecs/rt5670.c
··· 652 652 static int rt5670_dac1_playback_switch_get(struct snd_kcontrol *kcontrol, 653 653 struct snd_ctl_elem_value *ucontrol) 654 654 { 655 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 655 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 656 656 struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component); 657 657 658 658 ucontrol->value.integer.value[0] = rt5670->dac1_playback_switch_l; ··· 664 664 static int rt5670_dac1_playback_switch_put(struct snd_kcontrol *kcontrol, 665 665 struct snd_ctl_elem_value *ucontrol) 666 666 { 667 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 667 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 668 668 struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component); 669 669 670 670 if (rt5670->dac1_playback_switch_l == ucontrol->value.integer.value[0] &&