aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/nvme.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index f4996b0e4b1a..c1dc4d86c221 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -613,11 +613,7 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns,
613 return result; 613 return result;
614} 614}
615 615
616/* 616static void nvme_make_request(struct request_queue *q, struct bio *bio)
617 * NB: return value of non-zero would mean that we were a stacking driver.
618 * make_request must always succeed.
619 */
620static int nvme_make_request(struct request_queue *q, struct bio *bio)
621{ 617{
622 struct nvme_ns *ns = q->queuedata; 618 struct nvme_ns *ns = q->queuedata;
623 struct nvme_queue *nvmeq = get_nvmeq(ns->dev); 619 struct nvme_queue *nvmeq = get_nvmeq(ns->dev);
@@ -634,8 +630,6 @@ static int nvme_make_request(struct request_queue *q, struct bio *bio)
634 630
635 spin_unlock_irq(&nvmeq->q_lock); 631 spin_unlock_irq(&nvmeq->q_lock);
636 put_nvmeq(nvmeq); 632 put_nvmeq(nvmeq);
637
638 return 0;
639} 633}
640 634
641static irqreturn_t nvme_process_cq(struct nvme_queue *nvmeq) 635static irqreturn_t nvme_process_cq(struct nvme_queue *nvmeq)