Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fdd82bd authored by Adrian Bunk's avatar Adrian Bunk Committed by Jens Axboe
Browse files

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: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 49565124

block/as-iosched.c

+3 −1
Original line number Diff line number Diff line
@@ -1464,7 +1464,9 @@ static struct elevator_type iosched_as = { 


static int __init as_init(void)

{

	return elv_register(&iosched_as);

	elv_register(&iosched_as);



	return 0;

}



static void __exit as_exit(void)

block/cfq-iosched.c

+2 −6
Original line number Diff line number Diff line
@@ -2279,8 +2279,6 @@ static struct elevator_type iosched_cfq = { 


static int __init cfq_init(void)

{

	int ret;



	/*

	 * could be 0 on HZ < 1000 setups

	 */
@@ -2292,11 +2290,9 @@ static int __init cfq_init(void) 
	if (cfq_slab_setup())

		return -ENOMEM;



	ret = elv_register(&iosched_cfq);

	if (ret)

		cfq_slab_kill();

	elv_register(&iosched_cfq);



	return ret;

	return 0;

}



static void __exit cfq_exit(void)

block/deadline-iosched.c

+3 −1
Original line number Diff line number Diff line
@@ -467,7 +467,9 @@ static struct elevator_type iosched_deadline = { 


static int __init deadline_init(void)

{

	return elv_register(&iosched_deadline);

	elv_register(&iosched_deadline);



	return 0;

}



static void __exit deadline_exit(void)

block/elevator.c

+1 −2
Original line number Diff line number Diff line
@@ -960,7 +960,7 @@ void elv_unregister_queue(struct request_queue *q) 
		__elv_unregister_queue(q->elevator);

}



int elv_register(struct elevator_type *e)

void elv_register(struct elevator_type *e)

{

	char *def = "";
@@ -975,7 +975,6 @@ int elv_register(struct elevator_type *e) 
				def = " (default)";



	printk(KERN_INFO "io scheduler %s registered%s\n", e->elevator_name, def);

	return 0;

}

EXPORT_SYMBOL_GPL(elv_register);

block/noop-iosched.c

+3 −1
Original line number Diff line number Diff line
@@ -101,7 +101,9 @@ static struct elevator_type elevator_noop = { 


static int __init noop_init(void)

{

	return elv_register(&elevator_noop);

	elv_register(&elevator_noop);



	return 0;

}



static void __exit noop_exit(void)