[patch] 2.5.70-mm5: fix ieee1394_core.c compile if !CONFIG_PROC_FS

[patch] 2.5.70-mm5: fix ieee1394_core.c compile if !CONFIG_PROC_FS

[Adrian Bunk]

I got the following compile error with !CONFIG_PROC_FS:

<--  snip  -->

...
  CC      drivers/ieee1394/ieee1394_core.o
drivers/ieee1394/ieee1394_core.c: In function `ieee1394_cleanup':
drivers/ieee1394/ieee1394_core.c:1231: `proc_bus' undeclared (first use in this function)
drivers/ieee1394/ieee1394_core.c:1231: (Each undeclared identifier is reported only once
drivers/ieee1394/ieee1394_core.c:1231: for each function it appears in.)
make[2]: *** [drivers/ieee1394/ieee1394_core.o] Error 1

<--  snip  -->


The following patch fixes it:


--- linux-2.5.70-mm5/drivers/ieee1394/ieee1394_core.c.old	2003-06-07 16:42:35.000000000 +0200
+++ linux-2.5.70-mm5/drivers/ieee1394/ieee1394_core.c	2003-06-07 16:42:47.000000000 +0200
@@ -1228,7 +1228,9 @@
 
 	unregister_chrdev(IEEE1394_MAJOR, "ieee1394");
 	devfs_remove("ieee1394");
+#ifdef CONFIG_PROC_FS
 	remove_proc_entry("ieee1394", proc_bus);
+#endif
 }
 
 module_init(ieee1394_init);



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: [patch] 2.5.70-mm5: fix ieee1394_core.c compile if !CONFIG_PROC_FS

[Andrew Morton]

Adrian Bunk <bunk@fs.tum.de> wrote:
>
> I got the following compile error with !CONFIG_PROC_FS:
> 
> The following patch fixes it:
> --- linux-2.5.70-mm5/drivers/ieee1394/ieee1394_core.c.old	2003-06-07 16:42:35.000000000 +0200
> +++ linux-2.5.70-mm5/drivers/ieee1394/ieee1394_core.c	2003-06-07 16:42:47.000000000 +0200
> @@ -1228,7 +1228,9 @@
>  
>  	unregister_chrdev(IEEE1394_MAJOR, "ieee1394");
>  	devfs_remove("ieee1394");
> +#ifdef CONFIG_PROC_FS
>  	remove_proc_entry("ieee1394", proc_bus);
> +#endif
>  }
>  

proc_fs.h has:

static inline void remove_proc_entry(const char *name, struct proc_dir_entry *parent) {};

for the !CONFIG_PROC_FS case, so that _should_ have prevented this problem.
 What went wrong?

Re: [patch] 2.5.70-mm5: fix ieee1394_core.c compile if !CONFIG_PROC_FS

[Sam Ravnborg]

On Sat, Jun 07, 2003 at 01:06:25PM -0700, Andrew Morton wrote:
> Adrian Bunk <bunk@fs.tum.de> wrote:
> >
> > I got the following compile error with !CONFIG_PROC_FS:
> > 
> > The following patch fixes it:
> > --- linux-2.5.70-mm5/drivers/ieee1394/ieee1394_core.c.old	2003-06-07 16:42:35.000000000 +0200
> > +++ linux-2.5.70-mm5/drivers/ieee1394/ieee1394_core.c	2003-06-07 16:42:47.000000000 +0200
> > @@ -1228,7 +1228,9 @@
> >  
> >  	unregister_chrdev(IEEE1394_MAJOR, "ieee1394");
> >  	devfs_remove("ieee1394");
> > +#ifdef CONFIG_PROC_FS
> >  	remove_proc_entry("ieee1394", proc_bus);
> > +#endif
> >  }
> >  
> 
> proc_fs.h has:
> 
> static inline void remove_proc_entry(const char *name, struct proc_dir_entry *parent) {};
> 
> for the !CONFIG_PROC_FS case, so that _should_ have prevented this problem.
>  What went wrong?
proc_bus is only defined when CONFIG_PROC

	Sam