Merge tag 'for-5.12/block-2021-02-17' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / nvme / host / pci.c

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 6bad4d4..808ab51 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1357,7 +1357,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
        }
 
        abort_req->end_io_data = NULL;
-       blk_execute_rq_nowait(abort_req->q, NULL, abort_req, 0, abort_endio);
+       blk_execute_rq_nowait(NULL, abort_req, 0, abort_endio);
 
        /*
         * The aborted req will be completed on receiving the abort req.
@@ -2281,7 +2281,7 @@ static int nvme_delete_queue(struct nvme_queue *nvmeq, u8 opcode)
        req->end_io_data = nvmeq;
 
        init_completion(&nvmeq->delete_done);
-       blk_execute_rq_nowait(q, NULL, req, false,
+       blk_execute_rq_nowait(NULL, req, false,
                        opcode == nvme_admin_delete_cq ?
                                nvme_del_cq_end : nvme_del_queue_end);
        return 0;