block: let elv_register() return void

elv_register() always returns 0, and there isn't anything it does where
it should return an error (the only error condition is so grave that
it's handled with a BUG_ON).

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

authored by Adrian Bunk and committed by Jens Axboe 2fdd82bd 49565124

+13 -12
+3 -1
block/as-iosched.c
··· 1464 1465 static int __init as_init(void) 1466 { 1467 - return elv_register(&iosched_as); 1468 } 1469 1470 static void __exit as_exit(void)
··· 1464 1465 static int __init as_init(void) 1466 { 1467 + elv_register(&iosched_as); 1468 + 1469 + return 0; 1470 } 1471 1472 static void __exit as_exit(void)
+2 -6
block/cfq-iosched.c
··· 2279 2280 static int __init cfq_init(void) 2281 { 2282 - int ret; 2283 - 2284 /* 2285 * could be 0 on HZ < 1000 setups 2286 */ ··· 2290 if (cfq_slab_setup()) 2291 return -ENOMEM; 2292 2293 - ret = elv_register(&iosched_cfq); 2294 - if (ret) 2295 - cfq_slab_kill(); 2296 2297 - return ret; 2298 } 2299 2300 static void __exit cfq_exit(void)
··· 2279 2280 static int __init cfq_init(void) 2281 { 2282 /* 2283 * could be 0 on HZ < 1000 setups 2284 */ ··· 2292 if (cfq_slab_setup()) 2293 return -ENOMEM; 2294 2295 + elv_register(&iosched_cfq); 2296 2297 + return 0; 2298 } 2299 2300 static void __exit cfq_exit(void)
+3 -1
block/deadline-iosched.c
··· 467 468 static int __init deadline_init(void) 469 { 470 - return elv_register(&iosched_deadline); 471 } 472 473 static void __exit deadline_exit(void)
··· 467 468 static int __init deadline_init(void) 469 { 470 + elv_register(&iosched_deadline); 471 + 472 + return 0; 473 } 474 475 static void __exit deadline_exit(void)
+1 -2
block/elevator.c
··· 960 __elv_unregister_queue(q->elevator); 961 } 962 963 - int elv_register(struct elevator_type *e) 964 { 965 char *def = ""; 966 ··· 975 def = " (default)"; 976 977 printk(KERN_INFO "io scheduler %s registered%s\n", e->elevator_name, def); 978 - return 0; 979 } 980 EXPORT_SYMBOL_GPL(elv_register); 981
··· 960 __elv_unregister_queue(q->elevator); 961 } 962 963 + void elv_register(struct elevator_type *e) 964 { 965 char *def = ""; 966 ··· 975 def = " (default)"; 976 977 printk(KERN_INFO "io scheduler %s registered%s\n", e->elevator_name, def); 978 } 979 EXPORT_SYMBOL_GPL(elv_register); 980
+3 -1
block/noop-iosched.c
··· 101 102 static int __init noop_init(void) 103 { 104 - return elv_register(&elevator_noop); 105 } 106 107 static void __exit noop_exit(void)
··· 101 102 static int __init noop_init(void) 103 { 104 + elv_register(&elevator_noop); 105 + 106 + return 0; 107 } 108 109 static void __exit noop_exit(void)
+1 -1
include/linux/elevator.h
··· 119 /* 120 * io scheduler registration 121 */ 122 - extern int elv_register(struct elevator_type *); 123 extern void elv_unregister(struct elevator_type *); 124 125 /*
··· 119 /* 120 * io scheduler registration 121 */ 122 + extern void elv_register(struct elevator_type *); 123 extern void elv_unregister(struct elevator_type *); 124 125 /*