nvme-fc: remove unused "queue_size" field
authorKeith Busch <keith.busch@intel.com>
Tue, 7 Nov 2017 22:13:11 +0000 (15:13 -0700)
committerJens Axboe <axboe@kernel.dk>
Sat, 11 Nov 2017 02:53:25 +0000 (19:53 -0700)
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>
drivers/nvme/host/fc.c

index f3bfad47a95fb996b0fdd4991dc9e8c21042a2a7..3aa5950291925f56880595fe44c810d6194beec7 100644 (file)
@@ -43,7 +43,6 @@ struct nvme_fc_queue {
        struct device           *dev;
        struct blk_mq_hw_ctx    *hctx;
        void                    *lldd_handle;
-       int                     queue_size;
        size_t                  cmnd_capsule_len;
        u32                     qnum;
        u32                     rqcnt;
@@ -1886,7 +1885,7 @@ nvme_fc_init_admin_hctx(struct blk_mq_hw_ctx *hctx, void *data,
 }
 
 static void
-nvme_fc_init_queue(struct nvme_fc_ctrl *ctrl, int idx, size_t queue_size)
+nvme_fc_init_queue(struct nvme_fc_ctrl *ctrl, int idx)
 {
        struct nvme_fc_queue *queue;
 
@@ -1902,8 +1901,6 @@ nvme_fc_init_queue(struct nvme_fc_ctrl *ctrl, int idx, size_t queue_size)
        else
                queue->cmnd_capsule_len = sizeof(struct nvme_command);
 
-       queue->queue_size = queue_size;
-
        /*
         * Considered whether we should allocate buffers for all SQEs
         * and CQEs and dma map them - mapping their respective entries
@@ -2027,7 +2024,7 @@ nvme_fc_init_io_queues(struct nvme_fc_ctrl *ctrl)
        int i;
 
        for (i = 1; i < ctrl->ctrl.queue_count; i++)
-               nvme_fc_init_queue(ctrl, i, ctrl->ctrl.sqsize);
+               nvme_fc_init_queue(ctrl, i);
 }
 
 static void
@@ -2713,7 +2710,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl)
         * Create the admin queue
         */
 
-       nvme_fc_init_queue(ctrl, 0, NVME_AQ_BLK_MQ_DEPTH);
+       nvme_fc_init_queue(ctrl, 0);
 
        ret = __nvme_fc_create_hw_queue(ctrl, &ctrl->queues[0], 0,
                                NVME_AQ_BLK_MQ_DEPTH);