projects/linux·commit 2d2dce0e

[PATCH] Kill ifdefs in mtdcore.c

2d2dce0e · Pavel Machek <[email protected]> · 2006-03-31 02:29:49 -08:00

Kill unneccessary ifdefs in mtdcore.c.

Signed-off-by: Pavel Machek <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>
Acked-by: David Woodhouse <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
2d2dce0eb650831046316a9cd091ea5257aa7d4b
Parents
8b68a126

Changes

1 files changed · +4 −9

FileStatusAddDelContent
drivers/mtd/mtdcore.cmodified+4−9View file

drivers/mtd/mtdcore.c

View file
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 9c38134..9905870 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -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(unregister_mtd_user);
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 @@ done:
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]>");