nvme: use consistent macro name for timeout

This is purely a clenaup patch, add prefix NVME to the ADMIN_TIMEOUT to
make consistent with NVME_IO_TIMEOUT.

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 97348b1ecfd639c9ea63bccf8128e1500cf41aad..98bea150e5dc056ed9f379096a60c95e6fb6f325 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -536,7 +536,7 @@ struct request *nvme_alloc_request(struct request_queue *q,
        if (req->q->queuedata)
                req->timeout = NVME_IO_TIMEOUT;
        else /* no queuedata implies admin queue */
-               req->timeout = ADMIN_TIMEOUT;
+               req->timeout = NVME_ADMIN_TIMEOUT;
 
        req->cmd_flags |= REQ_FAILFAST_DRIVER;
        nvme_clear_nvme_request(req);
@@ -2268,8 +2268,8 @@ int nvme_sec_submit(void *data, u16 spsp, u8 secp, void *buffer, size_t len,
        cmd.common.cdw10 = cpu_to_le32(((u32)secp) << 24 | ((u32)spsp) << 8);
        cmd.common.cdw11 = cpu_to_le32(len);
 
-       return __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, NULL, buffer, len,
-                                     ADMIN_TIMEOUT, NVME_QID_ANY, 1, 0, false);
+       return __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, NULL, buffer, len, 0,
+                       NVME_QID_ANY, 1, 0, false);
 }
 EXPORT_SYMBOL_GPL(nvme_sec_submit);
 #endif /* CONFIG_BLK_SED_OPAL */

diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index f4c246462658fa50ac08387257c93b63ef7a122f..38373a0e86efb5ae4d8c80a371128b87e7611ca0 100644 (file)
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -3479,7 +3479,7 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts,
                            ctrl->lport->ops->fcprqst_priv_sz);
        ctrl->admin_tag_set.driver_data = ctrl;
        ctrl->admin_tag_set.nr_hw_queues = 1;
-       ctrl->admin_tag_set.timeout = ADMIN_TIMEOUT;
+       ctrl->admin_tag_set.timeout = NVME_ADMIN_TIMEOUT;
        ctrl->admin_tag_set.flags = BLK_MQ_F_NO_SCHED;
 
        ret = blk_mq_alloc_tag_set(&ctrl->admin_tag_set);

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 87867e93c7d30d90458df69eaac94d22b072e0c7..824776a8ba13e62dbc1fff50a76e35bef7833d37 100644 (file)
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -24,7 +24,7 @@ extern unsigned int nvme_io_timeout;
 #define NVME_IO_TIMEOUT        (nvme_io_timeout * HZ)
 
 extern unsigned int admin_timeout;
-#define ADMIN_TIMEOUT  (admin_timeout * HZ)
+#define NVME_ADMIN_TIMEOUT     (admin_timeout * HZ)
 
 #define NVME_DEFAULT_KATO      5
 #define NVME_KATO_GRACE                10

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 76465d3359248fae6538fa64692c62954114e3a3..6123040ff87204b5a4fc97c54e8dc1f80d9ff9c6 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1606,7 +1606,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev)
                dev->admin_tagset.nr_hw_queues = 1;
 
                dev->admin_tagset.queue_depth = NVME_AQ_MQ_TAG_DEPTH;
-               dev->admin_tagset.timeout = ADMIN_TIMEOUT;
+               dev->admin_tagset.timeout = NVME_ADMIN_TIMEOUT;
                dev->admin_tagset.numa_node = dev->ctrl.numa_node;
                dev->admin_tagset.cmd_size = sizeof(struct nvme_iod);
                dev->admin_tagset.flags = BLK_MQ_F_NO_SCHED;
@@ -2237,7 +2237,7 @@ static bool __nvme_disable_io_queues(struct nvme_dev *dev, u8 opcode)
        unsigned long timeout;
 
  retry:
-       timeout = ADMIN_TIMEOUT;
+       timeout = NVME_ADMIN_TIMEOUT;
        while (nr_queues > 0) {
                if (nvme_delete_queue(&dev->queues[nr_queues], opcode))
                        break;

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 65e3d0ef36e1a33dffad84405aaa07d819385380..df9f6f4549f16f1245fdf58606421df5dc94b4aa 100644 (file)
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -797,7 +797,7 @@ static struct blk_mq_tag_set *nvme_rdma_alloc_tagset(struct nvme_ctrl *nctrl,
                                NVME_RDMA_DATA_SGL_SIZE;
                set->driver_data = ctrl;
                set->nr_hw_queues = 1;
-               set->timeout = ADMIN_TIMEOUT;
+               set->timeout = NVME_ADMIN_TIMEOUT;
                set->flags = BLK_MQ_F_NO_SCHED;
        } else {
                set = &ctrl->tag_set;

diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index c0c33320fe659ffad05362a3fd146ff539fa58ea..1ba65992744277faba5c81fba011b80e5bd7d90c 100644 (file)
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -1568,7 +1568,7 @@ static struct blk_mq_tag_set *nvme_tcp_alloc_tagset(struct nvme_ctrl *nctrl,
                set->cmd_size = sizeof(struct nvme_tcp_request);
                set->driver_data = ctrl;
                set->nr_hw_queues = 1;
-               set->timeout = ADMIN_TIMEOUT;
+               set->timeout = NVME_ADMIN_TIMEOUT;
        } else {
                set = &ctrl->tag_set;
                memset(set, 0, sizeof(*set));

diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c
index f6d81239be2156651c207e01837ba12b6548ea37..76d8c0a9a87d650c99f5f259f9c9546ff926467e 100644 (file)
--- a/drivers/nvme/target/loop.c
+++ b/drivers/nvme/target/loop.c
@@ -345,7 +345,7 @@ static int nvme_loop_configure_admin_queue(struct nvme_loop_ctrl *ctrl)
                NVME_INLINE_SG_CNT * sizeof(struct scatterlist);
        ctrl->admin_tag_set.driver_data = ctrl;
        ctrl->admin_tag_set.nr_hw_queues = 1;
-       ctrl->admin_tag_set.timeout = ADMIN_TIMEOUT;
+       ctrl->admin_tag_set.timeout = NVME_ADMIN_TIMEOUT;
        ctrl->admin_tag_set.flags = BLK_MQ_F_NO_SCHED;
 
        ctrl->queues[0].ctrl = ctrl;