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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
f7fbe0ea 38159629

+2 -4
+2 -4
sound/soc/codecs/cs35l45.c
··· 198 198 static int cs35l45_amplifier_mode_get(struct snd_kcontrol *kcontrol, 199 199 struct snd_ctl_elem_value *ucontrol) 200 200 { 201 - struct snd_soc_component *component = 202 - snd_soc_kcontrol_component(kcontrol); 201 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 203 202 struct cs35l45_private *cs35l45 = 204 203 snd_soc_component_get_drvdata(component); 205 204 ··· 210 211 static int cs35l45_amplifier_mode_put(struct snd_kcontrol *kcontrol, 211 212 struct snd_ctl_elem_value *ucontrol) 212 213 { 213 - struct snd_soc_component *component = 214 - snd_soc_kcontrol_component(kcontrol); 214 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 215 215 struct cs35l45_private *cs35l45 = 216 216 snd_soc_component_get_drvdata(component); 217 217 struct snd_soc_dapm_context *dapm =