From 83058348201d730b5bf3b71ad32ed9849ed0358a Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Sun, 6 Feb 2011 09:01:00 -0500 Subject: [PATCH] --- yaml --- r: 286251 b: refs/heads/master c: ec6ce618d65b5ce1bef83a5509255107a0feac44 h: refs/heads/master i: 286249: 3cddb8f2de16ae4d519e2b4b9a1a620c0d53cc4e 286247: 19dc7ddf9e473940fd464b407facc84ced511274 v: v3 --- [refs] | 2 +- trunk/drivers/block/nvme.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d243924ada1d..5d0be8e5e12c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48e3d39816416b3bf03dee3a796c0c04427c1a31 +refs/heads/master: ec6ce618d65b5ce1bef83a5509255107a0feac44 diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c index f4085d4fe0f2..139e6fc1e2a8 100644 --- a/trunk/drivers/block/nvme.c +++ b/trunk/drivers/block/nvme.c @@ -476,11 +476,6 @@ static irqreturn_t nvme_process_cq(struct nvme_queue *nvmeq) } static irqreturn_t nvme_irq(int irq, void *data) -{ - return nvme_process_cq(data); -} - -static irqreturn_t nvme_irq_thread(int irq, void *data) { irqreturn_t result; struct nvme_queue *nvmeq = data; @@ -676,7 +671,7 @@ static int queue_request_irq(struct nvme_dev *dev, struct nvme_queue *nvmeq, { if (use_threaded_interrupts) return request_threaded_irq(dev->entry[nvmeq->cq_vector].vector, - nvme_irq_check, nvme_irq_thread, + nvme_irq_check, nvme_irq, IRQF_DISABLED | IRQF_SHARED, name, nvmeq); return request_irq(dev->entry[nvmeq->cq_vector].vector, nvme_irq,