Skip to content

Commit 08e1507

Browse files
Keith Buschaxboe
authored andcommitted
nvme-fc: remove unused "queue_size" field
This was being saved in a structure, but never used anywhere. The queue size is obtained through other means, so there's no reason to duplicate this without a user for it. Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Keith Busch <keith.busch@intel.com> Reviewed-by: Guan Junxiong <guanjunxiong@huawei.com> Reviewed-by: James Smart <james.smart@broadcom.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 38dabe2 commit 08e1507

File tree

1 file changed

+3
-6
lines changed
  • drivers/nvme/host

1 file changed

+3
-6
lines changed

drivers/nvme/host/fc.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ struct nvme_fc_queue {
4343
struct device *dev;
4444
struct blk_mq_hw_ctx *hctx;
4545
void *lldd_handle;
46-
int queue_size;
4746
size_t cmnd_capsule_len;
4847
u32 qnum;
4948
u32 rqcnt;
@@ -1886,7 +1885,7 @@ nvme_fc_init_admin_hctx(struct blk_mq_hw_ctx *hctx, void *data,
18861885
}
18871886

18881887
static void
1889-
nvme_fc_init_queue(struct nvme_fc_ctrl *ctrl, int idx, size_t queue_size)
1888+
nvme_fc_init_queue(struct nvme_fc_ctrl *ctrl, int idx)
18901889
{
18911890
struct nvme_fc_queue *queue;
18921891

@@ -1902,8 +1901,6 @@ nvme_fc_init_queue(struct nvme_fc_ctrl *ctrl, int idx, size_t queue_size)
19021901
else
19031902
queue->cmnd_capsule_len = sizeof(struct nvme_command);
19041903

1905-
queue->queue_size = queue_size;
1906-
19071904
/*
19081905
* Considered whether we should allocate buffers for all SQEs
19091906
* and CQEs and dma map them - mapping their respective entries
@@ -2027,7 +2024,7 @@ nvme_fc_init_io_queues(struct nvme_fc_ctrl *ctrl)
20272024
int i;
20282025

20292026
for (i = 1; i < ctrl->ctrl.queue_count; i++)
2030-
nvme_fc_init_queue(ctrl, i, ctrl->ctrl.sqsize);
2027+
nvme_fc_init_queue(ctrl, i);
20312028
}
20322029

20332030
static void
@@ -2713,7 +2710,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl)
27132710
* Create the admin queue
27142711
*/
27152712

2716-
nvme_fc_init_queue(ctrl, 0, NVME_AQ_BLK_MQ_DEPTH);
2713+
nvme_fc_init_queue(ctrl, 0);
27172714

27182715
ret = __nvme_fc_create_hw_queue(ctrl, &ctrl->queues[0], 0,
27192716
NVME_AQ_BLK_MQ_DEPTH);

0 commit comments

Comments
 (0)