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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
38159629 f2b55e56

+2 -4
+2 -4
sound/soc/codecs/cs35l36.c
··· 455 455 static int cs35l36_ldm_sel_get(struct snd_kcontrol *kcontrol, 456 456 struct snd_ctl_elem_value *ucontrol) 457 457 { 458 - struct snd_soc_component *component = 459 - snd_soc_kcontrol_component(kcontrol); 458 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 460 459 struct cs35l36_private *cs35l36 = 461 460 snd_soc_component_get_drvdata(component); 462 461 ··· 467 468 static int cs35l36_ldm_sel_put(struct snd_kcontrol *kcontrol, 468 469 struct snd_ctl_elem_value *ucontrol) 469 470 { 470 - struct snd_soc_component *component = 471 - snd_soc_kcontrol_component(kcontrol); 471 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 472 472 struct cs35l36_private *cs35l36 = 473 473 snd_soc_component_get_drvdata(component); 474 474 int val = (ucontrol->value.integer.value[0]) ? CS35L36_NG_AMP_EN_MASK :