lkml.org 
[lkml]   [2014]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 05/14] NVMe: Get rid of superfluous qid parameter to nvme_init_queue()
Date
Parameter qid is not only superfluous, but also confusing -
it suggests nvme_init_queue() could reinit the queue with an
ID other than index into device queues[] array.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
---
drivers/block/nvme-core.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 652f0f6..661277d 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -1278,9 +1278,10 @@ static int queue_request_irq(struct nvme_dev *dev, struct nvme_queue *nvmeq,
IRQF_SHARED, name, nvmeq);
}

-static void nvme_init_queue(struct nvme_queue *nvmeq, u16 qid)
+static void nvme_init_queue(struct nvme_queue *nvmeq)
{
struct nvme_dev *dev = nvmeq->dev;
+ u16 qid = nvmeq->qid;
unsigned extra = nvme_queue_extra(nvmeq->q_depth);

nvmeq->sq_tail = 0;
@@ -1296,7 +1297,6 @@ static void nvme_init_queue(struct nvme_queue *nvmeq, u16 qid)
static int nvme_create_queue(struct nvme_queue *nvmeq)
{
struct nvme_dev *dev = nvmeq->dev;
- int qid = nvmeq->qid;
int result;

result = adapter_alloc_cq(nvmeq);
@@ -1312,7 +1312,7 @@ static int nvme_create_queue(struct nvme_queue *nvmeq)
goto release_sq;

spin_lock_irq(&nvmeq->q_lock);
- nvme_init_queue(nvmeq, qid);
+ nvme_init_queue(nvmeq);
spin_unlock_irq(&nvmeq->q_lock);

return result;
@@ -1429,7 +1429,7 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)
return result;

spin_lock_irq(&nvmeq->q_lock);
- nvme_init_queue(nvmeq, 0);
+ nvme_init_queue(nvmeq);
spin_unlock_irq(&nvmeq->q_lock);
return result;
}
--
1.7.7.6


\
 
 \ /
  Last update: 2014-01-28 10:41    [W:0.144 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site