Commit a6ff7262 authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe

nvme-pci: Remove unused queue parameter

All the queue memory is allocated up front. We don't take the node
into consideration when creating queues anymore, so removing the unused
parameter.
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 64ee0ac0
...@@ -1380,8 +1380,7 @@ static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq, ...@@ -1380,8 +1380,7 @@ static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq,
return 0; return 0;
} }
static int nvme_alloc_queue(struct nvme_dev *dev, int qid, static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth)
int depth, int node)
{ {
struct nvme_queue *nvmeq = &dev->queues[qid]; struct nvme_queue *nvmeq = &dev->queues[qid];
...@@ -1596,8 +1595,7 @@ static int nvme_pci_configure_admin_queue(struct nvme_dev *dev) ...@@ -1596,8 +1595,7 @@ static int nvme_pci_configure_admin_queue(struct nvme_dev *dev)
if (result < 0) if (result < 0)
return result; return result;
result = nvme_alloc_queue(dev, 0, NVME_AQ_DEPTH, result = nvme_alloc_queue(dev, 0, NVME_AQ_DEPTH);
dev_to_node(dev->dev));
if (result) if (result)
return result; return result;
...@@ -1630,9 +1628,7 @@ static int nvme_create_io_queues(struct nvme_dev *dev) ...@@ -1630,9 +1628,7 @@ static int nvme_create_io_queues(struct nvme_dev *dev)
int ret = 0; int ret = 0;
for (i = dev->ctrl.queue_count; i <= dev->max_qid; i++) { for (i = dev->ctrl.queue_count; i <= dev->max_qid; i++) {
/* vector == qid - 1, match nvme_create_queue */ if (nvme_alloc_queue(dev, i, dev->q_depth)) {
if (nvme_alloc_queue(dev, i, dev->q_depth,
pci_irq_get_node(to_pci_dev(dev->dev), i - 1))) {
ret = -ENOMEM; ret = -ENOMEM;
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment