[alsa-devel] [PATCH] ALSA: Fix declaration of sound_class
Include sound/core.h in sound_core.c so that sound_class is declared before it is defined, avoiding it looking like it should be static.
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- sound/sound_core.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/sound_core.c b/sound/sound_core.c index 10ba421..2b302bb 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c @@ -10,6 +10,7 @@ #include <linux/module.h> #include <linux/device.h> #include <linux/err.h> +#include <sound/core.h>
#ifdef CONFIG_SOUND_OSS_CORE static int __init init_oss_soundcore(void);
At Mon, 15 Dec 2008 15:43:43 +0000, Mark Brown wrote:
Include sound/core.h in sound_core.c so that sound_class is declared before it is defined, avoiding it looking like it should be static.
It's a question whether it should be in linux/sound.h or in sound/core.h, but as long as it's declared in the latter file, I think it's OK to included it from sound_core.c although it's not ALSA-specific.
So I applied as is. Thanks.
Takashi
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com
sound/sound_core.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/sound_core.c b/sound/sound_core.c index 10ba421..2b302bb 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c @@ -10,6 +10,7 @@ #include <linux/module.h> #include <linux/device.h> #include <linux/err.h> +#include <sound/core.h>
#ifdef CONFIG_SOUND_OSS_CORE static int __init init_oss_soundcore(void); -- 1.5.6.5
On Mon, Dec 15, 2008 at 04:59:56PM +0100, Takashi Iwai wrote:
Mark Brown wrote:
Include sound/core.h in sound_core.c so that sound_class is declared before it is defined, avoiding it looking like it should be static.
It's a question whether it should be in linux/sound.h or in sound/core.h, but as long as it's declared in the latter file, I think it's OK to included it from sound_core.c although it's not ALSA-specific.
Yeah, the OSS code doesn't use the prototype from the header at all but instead has a local prototype in one of their C files which isn't terribly clever.
participants (2)
-
Mark Brown
-
Takashi Iwai