From: Stefan Haberland Date: Wed, 4 Mar 2015 13:29:47 +0000 (+0100) Subject: s390/dasd: remove setting of scheduler from driver X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a5fd8ddce2af98c7f8199d37a0b866e98f4c0de0;p=linux-beck.git s390/dasd: remove setting of scheduler from driver Remove the hard coded scheduler for the DASD device driver to enable change of the scheduler during runtime. Set recommended deadline scheduler via additional udev rule. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky --- diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 697a0b2158e6..26a51dc4278d 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c @@ -2965,8 +2965,6 @@ enum blk_eh_timer_return dasd_times_out(struct request *req) */ static int dasd_alloc_queue(struct dasd_block *block) { - int rc; - block->request_queue = blk_init_queue(do_dasd_request, &block->request_queue_lock); if (block->request_queue == NULL) @@ -2974,14 +2972,7 @@ static int dasd_alloc_queue(struct dasd_block *block) block->request_queue->queuedata = block; - elevator_exit(block->request_queue->elevator); - block->request_queue->elevator = NULL; - mutex_lock(&block->request_queue->sysfs_lock); - rc = elevator_init(block->request_queue, "deadline"); - if (rc) - blk_cleanup_queue(block->request_queue); - mutex_unlock(&block->request_queue->sysfs_lock); - return rc; + return 0; } /*