Commit 52cc2eef authored by Jens Axboe's avatar Jens Axboe

block: switch s390 tape_block and mg_disk to elevator_change()

Now that we have this API, switch the two in-kernel users to it.
Resolves an oops introduced by commit
1abec4fd.
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 5dd531a0
...@@ -974,8 +974,7 @@ static int mg_probe(struct platform_device *plat_dev) ...@@ -974,8 +974,7 @@ static int mg_probe(struct platform_device *plat_dev)
host->breq->queuedata = host; host->breq->queuedata = host;
/* mflash is random device, thanx for the noop */ /* mflash is random device, thanx for the noop */
elevator_exit(host->breq->elevator); err = elevator_change(host->breq, "noop");
err = elevator_init(host->breq, "noop");
if (err) { if (err) {
printk(KERN_ERR "%s:%d (elevator_init) fail\n", printk(KERN_ERR "%s:%d (elevator_init) fail\n",
__func__, __LINE__); __func__, __LINE__);
......
...@@ -217,8 +217,7 @@ tapeblock_setup_device(struct tape_device * device) ...@@ -217,8 +217,7 @@ tapeblock_setup_device(struct tape_device * device)
if (!blkdat->request_queue) if (!blkdat->request_queue)
return -ENOMEM; return -ENOMEM;
elevator_exit(blkdat->request_queue->elevator); rc = elevator_change(blkdat->request_queue, "noop");
rc = elevator_init(blkdat->request_queue, "noop");
if (rc) if (rc)
goto cleanup_queue; goto cleanup_queue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment