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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
73e86fbf 4b5e66fc

+2 -2
+2 -2
sound/soc/codecs/da732x.c
··· 323 323 static int da732x_hpf_set(struct snd_kcontrol *kcontrol, 324 324 struct snd_ctl_elem_value *ucontrol) 325 325 { 326 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 326 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 327 327 struct soc_enum *enum_ctrl = (struct soc_enum *)kcontrol->private_value; 328 328 unsigned int reg = enum_ctrl->reg; 329 329 unsigned int sel = ucontrol->value.enumerated.item[0]; ··· 351 351 static int da732x_hpf_get(struct snd_kcontrol *kcontrol, 352 352 struct snd_ctl_elem_value *ucontrol) 353 353 { 354 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 354 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 355 355 struct soc_enum *enum_ctrl = (struct soc_enum *)kcontrol->private_value; 356 356 unsigned int reg = enum_ctrl->reg; 357 357 int val;