On Tue, Jun 02, 2020 at 10:51:13AM +0530, Vaibhav Agarwal wrote: > Fix compilation errors for GB Audio topology parser code with recent > kernel versions. > > Signed-off-by: Vaibhav Agarwal <vaibhav.sr@xxxxxxxxx> > --- > drivers/staging/greybus/audio_topology.c | 130 +++++++++++------------ > 1 file changed, 61 insertions(+), 69 deletions(-) > > diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c > index 4ac30accf226..7d5e87341a5c 100644 > --- a/drivers/staging/greybus/audio_topology.c > +++ b/drivers/staging/greybus/audio_topology.c > @@ -5,8 +5,8 @@ > * Copyright 2015-2016 Linaro Ltd. > */ > > +#include <linux/greybus.h> > #include "audio_codec.h" > -#include "greybus_protocols.h" > > #define GBAUDIO_INVALID_ID 0xFF > > @@ -165,15 +165,15 @@ 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_codec *codec = snd_kcontrol_chip(kcontrol); > - struct gbaudio_codec_info *gbcodec = snd_soc_codec_get_drvdata(codec); > + struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol); > + struct gbaudio_codec_info *gb = snd_soc_component_get_drvdata(comp); Please rename "gbcodec" in a different patch. It's not related to fixing the compile. Otherwise it seems okay. regards, dan carpenter
