drivers/mtd/mtdcore.c: less PROC_FS=n #ifdef's
PATCH 1/1 drivers/mtd/mtdcore.c: less PROC_FS=n #ifdef's
I'm surprised that kill-ifdefs-in-mtdcorec.patch in -mm that removes #ifdef's for the PROC_FS=n case wasn't tested with PROC_FS=n...
<-- snip -->
...
CC drivers/mtd/mtdcore.odrivers/mtd/mtdcore.c: In function 'init_mtd':drivers/mtd/mtdcore.c:352: error: 'proc_mtd' undeclared (first use in this function) drivers/mtd/mtdcore.c:352: error: (Each undeclared identifier is reported only once drivers/mtd/mtdcore.c:352: error: for each function it appears in.) drivers/mtd/mtdcore.c:353: error: 'mtd_read_proc' undeclared (first use in this function) drivers/mtd/mtdcore.c: In function 'cleanup_mtd':drivers/mtd/mtdcore.c:359: error: 'proc_mtd' undeclared (first use in this function) make[2]: *** [drivers/mtd/mtdcore.o] Error 1
<-- snip -->
The patch below tries to do it in a correct way.
cu
Adrian
<-- snip -->
This patch reduces the number of #ifdef's for CONFIG_PROC_FS=n.
---
drivers/mtd/mtdcore.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/mtd/mtdcore.c renamed from drivers/mtd/mtdcore.c.old +4 -9
@@ -19,9 +19,7 @@#include <linux/ioctl.h> #include <linux/init.h> #include <linux/mtd/compatmac.h> -#ifdef CONFIG_PROC_FS #include <linux/proc_fs.h> -#endif #include <linux/mtd/mtd.h>
@@ -296,10 +294,11 @@EXPORT_SYMBOL (default_mtd_writev);EXPORT_SYMBOL (default_mtd_readv); +#ifdef CONFIG_PROC_FS +/*====================================================================*/ /* Support for /proc/mtd */ -#ifdef CONFIG_PROC_FS static struct proc_dir_entry *proc_mtd;static inline int mtd_proc_info (char *buf,int i)
@@ -344,31 +343,27 @@ return ((count < begin+len-off) ? count : begin+len-off); } -#endif /* CONFIG_PROC_FS */ -/*====================================================================*/ /* Init code */ static int __init init_mtd (void ) { -#ifdef CONFIG_PROC_FS if ((proc_mtd =create_proc_entry ("mtd" ,0 ,NULL ))) proc_mtd->read_proc = mtd_read_proc; -#endif return 0 ; } static void __exit cleanup_mtd(void) { -#ifdef CONFIG_PROC_FS if (proc_mtd)remove_proc_entry ("mtd" ,NULL ); -#endif }module_init (init_mtd);module_exit (cleanup_mtd); +#endif /* CONFIG_PROC_FS */ +MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("David Woodhouse <[email protected]>" );
Quoted 2 lines · Adrian Bunk
I'm surprised that kill-ifdefs-in-mtdcorec.patch in -mm that removes #ifdef's for the PROC_FS=n case wasn't tested with PROC_FS=n...
Sorry for that, I somehow assumed it was trivial and did not test it properly.
Pavel
Signature · 1 line
Picture of sleeping (Linux) penguin wanted...