[2.6 patch] sound/core/memalloc.c: fix PROC_FS=n compilation

[2.6 patch] sound/core/memalloc.c: fix PROC_FS=n compilation

[Adrian Bunk]

This patch fixes the following compile error with CONFIG_PROC_FS=n:

<--  snip  -->

...
  CC      sound/core/memalloc.o
sound/core/memalloc.c: In function 'snd_mem_exit':
sound/core/memalloc.c:657: error: 'snd_mem_proc' undeclared (first use in this function)
sound/core/memalloc.c:657: error: (Each undeclared identifier is reported only once
sound/core/memalloc.c:657: error: for each function it appears in.)
make[2]: *** [sound/core/memalloc.o] Error 1

<--  snip  -->


Since snd_mem_proc was needlessly global, I've also made it static.


Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.13-rc3-mm1-full/sound/core/memalloc.c.old	2005-07-23 01:25:03.000000000 +0200
+++ linux-2.6.13-rc3-mm1-full/sound/core/memalloc.c	2005-07-23 01:30:35.000000000 +0200
@@ -505,13 +505,13 @@
 	up(&list_mutex);
 }
 
+static struct proc_dir_entry *snd_mem_proc;
 
 #ifdef CONFIG_PROC_FS
 /*
  * proc file interface
  */
 #define SND_MEM_PROC_FILE	"driver/snd-page-alloc"
-struct proc_dir_entry *snd_mem_proc;
 
 static int snd_mem_proc_read(char *page, char **start, off_t off,
 			     int count, int *eof, void *data)

[2.6 patch] sound/core/memalloc.c: fix PROC_FS=n compilation

[Adrian Bunk]

This patch fixes the following compile error with CONFIG_PROC_FS=n:

<--  snip  -->

...
  CC      sound/core/memalloc.o
sound/core/memalloc.c: In function 'snd_mem_exit':
sound/core/memalloc.c:658: error: 'snd_mem_proc' undeclared (first use in this function)
sound/core/memalloc.c:658: error: (Each undeclared identifier is reported only once
sound/core/memalloc.c:658: error: for each function it appears in.)
make[2]: *** [sound/core/memalloc.o] Error 1

<--  snip  -->



Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.13-rc6-mm1-full/sound/core/memalloc.c.old	2005-08-20 15:12:55.000000000 +0200
+++ linux-2.6.13-rc6-mm1-full/sound/core/memalloc.c	2005-08-20 15:16:55.000000000 +0200
@@ -506,13 +506,13 @@
 	up(&list_mutex);
 }
 
+static struct proc_dir_entry *snd_mem_proc;
 
 #ifdef CONFIG_PROC_FS
 /*
  * proc file interface
  */
 #define SND_MEM_PROC_FILE	"driver/snd-page-alloc"
-static struct proc_dir_entry *snd_mem_proc;
 
 static int snd_mem_proc_read(char *page, char **start, off_t off,
 			     int count, int *eof, void *data)

Re: [Alsa-devel] [2.6 patch] sound/core/memalloc.c: fix PROC_FS=n compilation

[Takashi Iwai]

At Sat, 20 Aug 2005 21:02:58 +0200,
Adrian Bunk wrote:
> 
> This patch fixes the following compile error with CONFIG_PROC_FS=n:
> 
> <--  snip  -->
> 
> ...
>   CC      sound/core/memalloc.o
> sound/core/memalloc.c: In function 'snd_mem_exit':
> sound/core/memalloc.c:658: error: 'snd_mem_proc' undeclared (first use in this function)
> sound/core/memalloc.c:658: error: (Each undeclared identifier is reported only once
> sound/core/memalloc.c:658: error: for each function it appears in.)
> make[2]: *** [sound/core/memalloc.o] Error 1
> 
> <--  snip  -->
> 
> 
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> 
> --- linux-2.6.13-rc6-mm1-full/sound/core/memalloc.c.old	2005-08-20 15:12:55.000000000 +0200
> +++ linux-2.6.13-rc6-mm1-full/sound/core/memalloc.c	2005-08-20 15:16:55.000000000 +0200
> @@ -506,13 +506,13 @@
>  	up(&list_mutex);
>  }
>  
> +static struct proc_dir_entry *snd_mem_proc;
>  
>  #ifdef CONFIG_PROC_FS
>  /*
>   * proc file interface
>   */
>  #define SND_MEM_PROC_FILE	"driver/snd-page-alloc"
> -static struct proc_dir_entry *snd_mem_proc;
>  
>  static int snd_mem_proc_read(char *page, char **start, off_t off,
>  			     int count, int *eof, void *data)
> 

I think the below is simpler.


Takashi

--- linux/sound/core/memalloc.c	12 Aug 2005 15:39:48 -0000	1.44
+++ linux/sound/core/memalloc.c	22 Aug 2005 12:39:23 -0000
@@ -655,8 +655,7 @@
 
 static void __exit snd_mem_exit(void)
 {
-	if (snd_mem_proc)
-		remove_proc_entry(SND_MEM_PROC_FILE, NULL);
+	remove_proc_entry(SND_MEM_PROC_FILE, NULL);
 	free_all_reserved_pages();
 	if (snd_allocated_pages > 0)
 		printk(KERN_ERR "snd-malloc: Memory leak?  pages not freed = %li\n", snd_allocated_pages);

Re: [Alsa-devel] [2.6 patch] sound/core/memalloc.c: fix PROC_FS=n compilation

[Adrian Bunk]

On Mon, Aug 22, 2005 at 02:41:07PM +0200, Takashi Iwai wrote:
>...
> I think the below is simpler.

Looks good.

> Takashi
>...

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [Alsa-devel] [2.6 patch] sound/core/memalloc.c: fix PROC_FS=n compilation

[Takashi Iwai]

At Tue, 23 Aug 2005 03:24:25 +0200,
Adrian Bunk wrote:
> 
> On Mon, Aug 22, 2005 at 02:41:07PM +0200, Takashi Iwai wrote:
> >...
> > I think the below is simpler.
> 
> Looks good.

OK, it's now on ALSA tree.

Thanks.


Takashi