Merge tag 'lsm-pr-20220801' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm

[platform/kernel/linux-starfive.git] / drivers / mmc / core / queue.c

diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
index fa5324c..fefaa90 100644 (file)
--- a/drivers/mmc/core/queue.c
+++ b/drivers/mmc/core/queue.c
@@ -116,8 +116,7 @@ static enum blk_eh_timer_return mmc_cqe_timed_out(struct request *req)
        }
 }
 
-static enum blk_eh_timer_return mmc_mq_timed_out(struct request *req,
-                                                bool reserved)
+static enum blk_eh_timer_return mmc_mq_timed_out(struct request *req)
 {
        struct request_queue *q = req->q;
        struct mmc_queue *mq = q->queuedata;
@@ -494,7 +493,6 @@ void mmc_cleanup_queue(struct mmc_queue *mq)
        if (blk_queue_quiesced(q))
                blk_mq_unquiesce_queue(q);
 
-       blk_cleanup_queue(q);
        blk_mq_free_tag_set(&mq->tag_set);
 
        /*