summaryrefslogtreecommitdiff
path: root/block/cfq-iosched.c
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2007-12-12 18:51:56 +0100
committerJens Axboe <jens.axboe@oracle.com>2007-12-18 08:29:28 +0100
commit2fdd82bd8852ec8ebad5c69c45138da25c6f9273 (patch)
treeff701ec0a8909fa50b79763a49a4eaada5aa759e /block/cfq-iosched.c
parent49565124b13bb16607e7f8fc8fb1d9c5c355a1a3 (diff)
downloadconfigs-2fdd82bd8852ec8ebad5c69c45138da25c6f9273.tar.gz
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>
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r--block/cfq-iosched.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 0b4a4790557..13553e015d7 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -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)