Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] Kill ifdefs in mtdcore.c

Kill unneccessary ifdefs in mtdcore.c.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Pavel Machek and committed by
Linus Torvalds
2d2dce0e 8b68a126

+4 -9
+4 -9
drivers/mtd/mtdcore.c
··· 19 19 #include <linux/ioctl.h> 20 20 #include <linux/init.h> 21 21 #include <linux/mtd/compatmac.h> 22 - #ifdef CONFIG_PROC_FS 23 22 #include <linux/proc_fs.h> 24 - #endif 25 23 26 24 #include <linux/mtd/mtd.h> 27 25 ··· 294 296 EXPORT_SYMBOL(default_mtd_writev); 295 297 EXPORT_SYMBOL(default_mtd_readv); 296 298 299 + #ifdef CONFIG_PROC_FS 300 + 297 301 /*====================================================================*/ 298 302 /* Support for /proc/mtd */ 299 303 300 - #ifdef CONFIG_PROC_FS 301 304 static struct proc_dir_entry *proc_mtd; 302 305 303 306 static inline int mtd_proc_info (char *buf, int i) ··· 343 344 return ((count < begin+len-off) ? count : begin+len-off); 344 345 } 345 346 346 - #endif /* CONFIG_PROC_FS */ 347 - 348 347 /*====================================================================*/ 349 348 /* Init code */ 350 349 351 350 static int __init init_mtd(void) 352 351 { 353 - #ifdef CONFIG_PROC_FS 354 352 if ((proc_mtd = create_proc_entry( "mtd", 0, NULL ))) 355 353 proc_mtd->read_proc = mtd_read_proc; 356 - #endif 357 354 return 0; 358 355 } 359 356 360 357 static void __exit cleanup_mtd(void) 361 358 { 362 - #ifdef CONFIG_PROC_FS 363 359 if (proc_mtd) 364 360 remove_proc_entry( "mtd", NULL); 365 - #endif 366 361 } 367 362 368 363 module_init(init_mtd); 369 364 module_exit(cleanup_mtd); 365 + 366 + #endif /* CONFIG_PROC_FS */ 370 367 371 368 372 369 MODULE_LICENSE("GPL");