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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
13c4c81b ddd1705b

+2 -2
+2 -2
sound/soc/codecs/es8328.c
··· 142 142 static int es8328_get_deemph(struct snd_kcontrol *kcontrol, 143 143 struct snd_ctl_elem_value *ucontrol) 144 144 { 145 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 145 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 146 146 struct es8328_priv *es8328 = snd_soc_component_get_drvdata(component); 147 147 148 148 ucontrol->value.integer.value[0] = es8328->deemph; ··· 152 152 static int es8328_put_deemph(struct snd_kcontrol *kcontrol, 153 153 struct snd_ctl_elem_value *ucontrol) 154 154 { 155 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 155 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 156 156 struct es8328_priv *es8328 = snd_soc_component_get_drvdata(component); 157 157 unsigned int deemph = ucontrol->value.integer.value[0]; 158 158 int ret;