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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
5ab215f2 d7e13998

+3 -3
+3 -3
sound/soc/codecs/rt9123.c
··· 107 107 108 108 static int rt9123_kcontrol_name_comp(struct snd_kcontrol *kcontrol, const char *s) 109 109 { 110 - struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol); 110 + struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol); 111 111 const char *kctlname = kcontrol->id.name; 112 112 113 113 if (comp && comp->name_prefix) ··· 118 118 119 119 static int rt9123_xhandler_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) 120 120 { 121 - struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol); 121 + struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol); 122 122 struct device *dev = comp->dev; 123 123 int ret; 124 124 ··· 145 145 146 146 static int rt9123_xhandler_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) 147 147 { 148 - struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol); 148 + struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol); 149 149 struct device *dev = comp->dev; 150 150 int ret; 151 151