mirror of https://github.com/torvalds/linux.git
ASoC: greybus: 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/87tt02t8s1.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
211ddde082
commit
cf9d07738f
|
|
@ -163,7 +163,7 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol,
|
|||
struct gbaudio_ctl_pvt *data;
|
||||
struct gb_audio_ctl_elem_info *info;
|
||||
struct gbaudio_module_info *module;
|
||||
struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol);
|
||||
struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol);
|
||||
struct gbaudio_codec_info *gbcodec = snd_soc_component_get_drvdata(comp);
|
||||
|
||||
dev_dbg(comp->dev, "Entered %s:%s\n", __func__, kcontrol->id.name);
|
||||
|
|
@ -214,7 +214,7 @@ static int gbcodec_mixer_ctl_get(struct snd_kcontrol *kcontrol,
|
|||
struct gbaudio_ctl_pvt *data;
|
||||
struct gb_audio_ctl_elem_value gbvalue;
|
||||
struct gbaudio_module_info *module;
|
||||
struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol);
|
||||
struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol);
|
||||
struct gbaudio_codec_info *gb = snd_soc_component_get_drvdata(comp);
|
||||
struct gb_bundle *bundle;
|
||||
|
||||
|
|
@ -276,7 +276,7 @@ static int gbcodec_mixer_ctl_put(struct snd_kcontrol *kcontrol,
|
|||
struct gbaudio_ctl_pvt *data;
|
||||
struct gb_audio_ctl_elem_value gbvalue;
|
||||
struct gbaudio_module_info *module;
|
||||
struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol);
|
||||
struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol);
|
||||
struct gbaudio_codec_info *gb = snd_soc_component_get_drvdata(comp);
|
||||
struct gb_bundle *bundle;
|
||||
|
||||
|
|
@ -543,7 +543,7 @@ static int gbcodec_enum_ctl_get(struct snd_kcontrol *kcontrol,
|
|||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
int ret, ctl_id;
|
||||
struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol);
|
||||
struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol);
|
||||
struct gbaudio_codec_info *gb = snd_soc_component_get_drvdata(comp);
|
||||
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
|
||||
struct gb_audio_ctl_elem_value gbvalue;
|
||||
|
|
@ -588,7 +588,7 @@ static int gbcodec_enum_ctl_put(struct snd_kcontrol *kcontrol,
|
|||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
int ret, ctl_id;
|
||||
struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol);
|
||||
struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol);
|
||||
struct gbaudio_codec_info *gb = snd_soc_component_get_drvdata(comp);
|
||||
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
|
||||
struct gb_audio_ctl_elem_value gbvalue;
|
||||
|
|
|
|||
Loading…
Reference in New Issue