[alsa-devel] [PATCH 5/5] ALSA: uapi: Drop asound.h inclusion from asoc.h

Takashi Iwai tiwai at suse.de
Mon Mar 30 21:11:03 CEST 2020


On Mon, 30 Mar 2020 18:53:11 +0200,
Dmitry V. Levin wrote:
> 
> Hi,
> 
> On Fri, Dec 20, 2019 at 04:34:15PM +0100, Takashi Iwai wrote:
> > The asound.h isn't always available while asoc.h itself is distributed
> > in alsa-lib package.  So we need to avoid the unnecessary inclusion of
> > asound.h from there.
> > 
> > Signed-off-by: Takashi Iwai <tiwai at suse.de>
> > ---
> >  include/uapi/sound/asoc.h | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h
> > index a74ca232f1fc..6048553c119d 100644
> > --- a/include/uapi/sound/asoc.h
> > +++ b/include/uapi/sound/asoc.h
> > @@ -17,7 +17,6 @@
> >  #define __LINUX_UAPI_SND_ASOC_H
> >  
> >  #include <linux/types.h>
> > -#include <sound/asound.h>
> >  
> >  /*
> >   * Maximum number of channels topology kcontrol can represent.
> 
> This has reached v5.6 and caused the following regression:
> 
> sound/asoc.h:214:14: error: 'SNDRV_CTL_ELEM_ID_NAME_MAXLEN' undeclared here (not in a function)
>   214 |  char string[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];

What program caused it?  The change was done because it broke (already
years log) the old alsa-lib code.  So reverting it will break it
again.

OTOH, alsa-lib breakage could be worked around inside alsa-lib, so
likely I'm going to revert it.  But I'd like to know exact cases.


thanks,

Takashi

> 
> Please revert or fix in some way to make the uapi header compileable again.
> 
> Thanks,
> 
> 
> -- 
> ldv
> 


More information about the Alsa-devel mailing list