---

yaml --- r: 286251 b: refs/heads/master c: ec6ce61 h: refs/heads/master i: 286249: 3cddb8f 286247: 19dc7dd v: v3
git-mirror · Nov 4, 2011 · 8305834 · 8305834
1 parent 98fa6e4
commit 8305834
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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,