The Kconfig currently controlling compilation of this code is: config IOSCHED_NOOP bool default y
...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We also delete the MODULE_LICENSE tag etc. since all that information is now contained at the top of the file in the comments. Cc: Jens Axboe <[email protected]> Signed-off-by: Paul Gortmaker <[email protected]> --- block/noop-iosched.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/block/noop-iosched.c b/block/noop-iosched.c index a163c487cf38..09f089ee7668 100644 --- a/block/noop-iosched.c +++ b/block/noop-iosched.c @@ -1,10 +1,11 @@ /* - * elevator noop + * elevator noop: No-op IO scheduler + * Author: Jens Axboe + * License: GPL */ #include <linux/blkdev.h> #include <linux/elevator.h> #include <linux/bio.h> -#include <linux/module.h> #include <linux/slab.h> #include <linux/init.h> @@ -109,16 +110,4 @@ static int __init noop_init(void) { return elv_register(&elevator_noop); } - -static void __exit noop_exit(void) -{ - elv_unregister(&elevator_noop); -} - -module_init(noop_init); -module_exit(noop_exit); - - -MODULE_AUTHOR("Jens Axboe"); -MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("No-op IO scheduler"); +device_initcall(noop_init); -- 2.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
