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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
5366dceb a5e7aaee

+4 -4
+4 -4
sound/soc/codecs/idt821034.c
··· 402 402 struct snd_ctl_elem_value *ucontrol) 403 403 { 404 404 struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; 405 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 405 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 406 406 struct idt821034 *idt821034 = snd_soc_component_get_drvdata(component); 407 407 int min = mc->min; 408 408 int max = mc->max; ··· 433 433 struct snd_ctl_elem_value *ucontrol) 434 434 { 435 435 struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; 436 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 436 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 437 437 struct idt821034 *idt821034 = snd_soc_component_get_drvdata(component); 438 438 struct idt821034_amp *amp; 439 439 int min = mc->min; ··· 487 487 static int idt821034_kctrl_mute_get(struct snd_kcontrol *kcontrol, 488 488 struct snd_ctl_elem_value *ucontrol) 489 489 { 490 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 490 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 491 491 struct idt821034 *idt821034 = snd_soc_component_get_drvdata(component); 492 492 int id = kcontrol->private_value; 493 493 bool is_muted; ··· 509 509 static int idt821034_kctrl_mute_put(struct snd_kcontrol *kcontrol, 510 510 struct snd_ctl_elem_value *ucontrol) 511 511 { 512 - struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); 512 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 513 513 struct idt821034 *idt821034 = snd_soc_component_get_drvdata(component); 514 514 int id = kcontrol->private_value; 515 515 struct idt821034_amp *amp;