NVMe: Factor out queue_request_irq()
Two callers with an almost identical long string of arguments, and introducing a third soon. Time to factor out the commonalities. Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
This commit is contained in:
parent
b60503ba43
commit
3001082cac
1 changed files with 9 additions and 4 deletions
|
@ -568,6 +568,13 @@ static struct nvme_queue *nvme_alloc_queue(struct nvme_dev *dev, int qid,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int queue_request_irq(struct nvme_dev *dev, struct nvme_queue *nvmeq,
|
||||||
|
const char *name)
|
||||||
|
{
|
||||||
|
return request_irq(dev->entry[nvmeq->cq_vector].vector, nvme_irq,
|
||||||
|
IRQF_DISABLED | IRQF_SHARED, name, nvmeq);
|
||||||
|
}
|
||||||
|
|
||||||
static __devinit struct nvme_queue *nvme_create_queue(struct nvme_dev *dev,
|
static __devinit struct nvme_queue *nvme_create_queue(struct nvme_dev *dev,
|
||||||
int qid, int cq_size, int vector)
|
int qid, int cq_size, int vector)
|
||||||
{
|
{
|
||||||
|
@ -582,8 +589,7 @@ static __devinit struct nvme_queue *nvme_create_queue(struct nvme_dev *dev,
|
||||||
if (result < 0)
|
if (result < 0)
|
||||||
goto release_cq;
|
goto release_cq;
|
||||||
|
|
||||||
result = request_irq(dev->entry[vector].vector, nvme_irq,
|
result = queue_request_irq(dev, nvmeq, "nvme");
|
||||||
IRQF_DISABLED | IRQF_SHARED, "nvme", nvmeq);
|
|
||||||
if (result < 0)
|
if (result < 0)
|
||||||
goto release_sq;
|
goto release_sq;
|
||||||
|
|
||||||
|
@ -630,8 +636,7 @@ static int __devinit nvme_configure_admin_queue(struct nvme_dev *dev)
|
||||||
return -EINTR;
|
return -EINTR;
|
||||||
}
|
}
|
||||||
|
|
||||||
result = request_irq(dev->entry[0].vector, nvme_irq,
|
result = queue_request_irq(dev, nvmeq, "nvme admin");
|
||||||
IRQF_DISABLED | IRQF_SHARED, "nvme admin", nvmeq);
|
|
||||||
dev->queues[0] = nvmeq;
|
dev->queues[0] = nvmeq;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue