Merge tag 'armsoc-tee' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index bf11e70f008b10692cdc290e14fc351f30f972c9..ab726a5c0bf6eaa3039a472a65dd8fb3435f606b 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -950,7 +950,6 @@ static int elevator_switch_mq(struct request_queue *q,
        int ret;
 
        blk_mq_freeze_queue(q);
-       blk_mq_quiesce_queue(q);
 
        if (q->elevator) {
                if (q->elevator->registered)
@@ -978,9 +977,7 @@ static int elevator_switch_mq(struct request_queue *q,
 
 out:
        blk_mq_unfreeze_queue(q);
-       blk_mq_start_stopped_hw_queues(q, true);
        return ret;
-
 }
 
 /*
@@ -1088,19 +1085,6 @@ static int __elevator_change(struct request_queue *q, const char *name)
        return elevator_switch(q, e);
 }
 
-int elevator_change(struct request_queue *q, const char *name)
-{
-       int ret;
-
-       /* Protect q->elevator from elevator_init() */
-       mutex_lock(&q->sysfs_lock);
-       ret = __elevator_change(q, name);
-       mutex_unlock(&q->sysfs_lock);
-
-       return ret;
-}
-EXPORT_SYMBOL(elevator_change);
-
 static inline bool elv_support_iosched(struct request_queue *q)
 {
        if (q->mq_ops && q->tag_set && (q->tag_set->flags &