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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
fd27a636 40c729f0

+2 -4
+2 -4
sound/soc/codecs/bd28623.c
··· 70 70 static int bd28623_get_switch_spk(struct snd_kcontrol *kcontrol, 71 71 struct snd_ctl_elem_value *ucontrol) 72 72 { 73 - struct snd_soc_component *component = 74 - snd_soc_kcontrol_component(kcontrol); 73 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 75 74 struct bd28623_priv *bd = snd_soc_component_get_drvdata(component); 76 75 77 76 ucontrol->value.integer.value[0] = bd->switch_spk; ··· 81 82 static int bd28623_set_switch_spk(struct snd_kcontrol *kcontrol, 82 83 struct snd_ctl_elem_value *ucontrol) 83 84 { 84 - struct snd_soc_component *component = 85 - snd_soc_kcontrol_component(kcontrol); 85 + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 86 86 struct bd28623_priv *bd = snd_soc_component_get_drvdata(component); 87 87 88 88 if (bd->switch_spk == ucontrol->value.integer.value[0])