[alsa-devel] [PATCH][alsa-lib] topology: fix unused-const-variable warning

Lin, Mengdong mengdong.lin at intel.com
Fri Dec 23 15:48:52 CET 2016


> -----Original Message-----
> From: alsa-devel-bounces at alsa-project.org [mailto:alsa-devel-
> bounces at alsa-project.org] On Behalf Of Liam Girdwood
> Sent: Friday, December 23, 2016 4:49 PM
> 
> This looks fine by me, Mengdong is this still unused or is it needed by a
> future patch ?

Hi Liam,

This "widget_control_map" is still unused now.

Could you remember why we define this map in the early phase?
I guess previously we want to distinguish stand-alone controls from controls embedded in widgets. But now we process them in the same way, both in user space and kernel. 

So I feel we can remove this structure. 

Thanks
Mengdong

> 
> On Sat, 2016-12-17 at 09:39 +0900, Takashi Sakamoto wrote:
> > Ping to Liam. I wish this patch would be included to next release of
> > this library.
> >
> > On 2016年11月30日 00:44, Takashi Sakamoto wrote:
> > > Last year, unused static const variable was added, then compiler
> > > generates a below warning.
> > >
> > > dapm.c:43:30: warning: ‘widget_control_map’ defined but not used
> > > [-Wunused-const-variable=]  static const struct map_elem
> widget_control_map[] = {
> > >                               ^~~~~~~~~~~~~~~~~~
> > >
> > > This commit removes it.
> > >
> > > Fixes: 01a0e1a1c219 ("topology: Add DAPM object parser")
> > > Signed-off-by: Takashi Sakamoto <o-takashi at sakamocchi.jp>
> > > ---
> > >  src/topology/dapm.c | 8 --------
> > >  1 file changed, 8 deletions(-)
> > >
> > > diff --git a/src/topology/dapm.c b/src/topology/dapm.c index
> > > e830751..8c585a7 100644
> > > --- a/src/topology/dapm.c
> > > +++ b/src/topology/dapm.c
> > > @@ -39,14 +39,6 @@ static const struct map_elem widget_map[] = {
> > >  	{"dai_link", SND_SOC_TPLG_DAPM_DAI_LINK},  };
> > >
> > > -/* mapping of widget kcontrol text names to types */ -static const
> > > struct map_elem widget_control_map[] = {
> > > -	{"volsw", SND_SOC_TPLG_DAPM_CTL_VOLSW},
> > > -	{"enum_double", SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE},
> > > -	{"enum_virt", SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT},
> > > -	{"enum_value", SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE},
> > > -};
> > > -
> > >  static int lookup_widget(const char *w)  {
> > >  	unsigned int i;
> > >
> 
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel at alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel


More information about the Alsa-devel mailing list