nvme: rename nvme_init_identify()

This is a prep patch so that we can move the identify data structure
related code initialization from nvme_init_identify() into a helper.

Rename the function nvmet_init_identify() to nvmet_init_ctrl_finish().

Next patch will move the nvme_id_ctrl related initialization from newly
renamed function nvme_init_ctrl_finish() into the nvme_init_identify()
helper.

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 3bbaf48833a8ec56b7c678618440387727f967bc..703f6ce6620d81470e327eb902ade2ddeeae82a3 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1120,7 +1120,7 @@ static void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects)
                mutex_unlock(&ctrl->scan_lock);
        }
        if (effects & NVME_CMD_EFFECTS_CCC)
-               nvme_init_identify(ctrl);
+               nvme_init_ctrl_finish(ctrl);
        if (effects & (NVME_CMD_EFFECTS_NIC | NVME_CMD_EFFECTS_NCC)) {
                nvme_queue_scan(ctrl);
                flush_work(&ctrl->scan_work);
@@ -1980,7 +1980,7 @@ static void nvme_config_write_zeroes(struct gendisk *disk, struct nvme_ns *ns)
         * In order to be more cautious use controller's max_hw_sectors value
         * to configure the maximum sectors for the write-zeroes which is
         * configured based on the controller's MDTS field in the
-        * nvme_init_identify() if available.
+        * nvme_init_ctrl_finish() if available.
         */
        if (ns->ctrl->max_hw_sectors == UINT_MAX)
                max_blocks = (u64)USHRT_MAX + 1;
@@ -3066,7 +3066,7 @@ out:
  * register in our nvme_ctrl structure.  This should be called as soon as
  * the admin queue is fully up and running.
  */
-int nvme_init_identify(struct nvme_ctrl *ctrl)
+int nvme_init_ctrl_finish(struct nvme_ctrl *ctrl)
 {
        struct nvme_id_ctrl *id;
        int ret, page_shift;
@@ -3253,7 +3253,7 @@ out_free:
        kfree(id);
        return ret;
 }
-EXPORT_SYMBOL_GPL(nvme_init_identify);
+EXPORT_SYMBOL_GPL(nvme_init_ctrl_finish);
 
 static int nvme_dev_open(struct inode *inode, struct file *file)
 {

diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 73d0737483891b40e3fd1bc71f302e0224de7a41..cb5cdef000bd833fc3b5c881506b6f7678bb9623 100644 (file)
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -3086,7 +3086,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl)
 
        blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);
 
-       ret = nvme_init_identify(&ctrl->ctrl);
+       ret = nvme_init_ctrl_finish(&ctrl->ctrl);
        if (ret || test_bit(ASSOC_FAILED, &ctrl->flags))
                goto out_disconnect_admin_queue;
 

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index e82407d1ec232c1ed0d31c99d51df5f60870f469..76de7ed55d90a80148583282b88b02205487be42 100644 (file)
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -599,7 +599,7 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev,
 void nvme_uninit_ctrl(struct nvme_ctrl *ctrl);
 void nvme_start_ctrl(struct nvme_ctrl *ctrl);
 void nvme_stop_ctrl(struct nvme_ctrl *ctrl);
-int nvme_init_identify(struct nvme_ctrl *ctrl);
+int nvme_init_ctrl_finish(struct nvme_ctrl *ctrl);
 
 void nvme_remove_namespaces(struct nvme_ctrl *ctrl);
 

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index f03177589c02d11090073f81644a96312a6f615d..ecd11b1febf82dfea5a152c8a8159a25a1a88e92 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2645,7 +2645,7 @@ static void nvme_reset_work(struct work_struct *work)
         */
        dev->ctrl.max_integrity_segments = 1;
 
-       result = nvme_init_identify(&dev->ctrl);
+       result = nvme_init_ctrl_finish(&dev->ctrl);
        if (result)
                goto out;
 

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 53ac4d7442ba9c59b5384c2c888e14580a224771..9c710839b03a4965fa22e16f3f06e527c01b670f 100644 (file)
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -917,7 +917,7 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl,
 
        blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);
 
-       error = nvme_init_identify(&ctrl->ctrl);
+       error = nvme_init_ctrl_finish(&ctrl->ctrl);
        if (error)
                goto out_quiesce_queue;
 

diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index 69f59d2c5799b8dbaf04f43a4c0e2e8628c16135..735e768f9f43645f17557f8b26a3212a75032efb 100644 (file)
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -1875,7 +1875,7 @@ static int nvme_tcp_configure_admin_queue(struct nvme_ctrl *ctrl, bool new)
 
        blk_mq_unquiesce_queue(ctrl->admin_q);
 
-       error = nvme_init_identify(ctrl);
+       error = nvme_init_ctrl_finish(ctrl);
        if (error)
                goto out_quiesce_queue;
 

diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c
index cb6f86572b24ad37c12408f7733bf9ffbb5677c3..a7f97c8b2f771241ffaa366f819fc3ee1f535016 100644 (file)
--- a/drivers/nvme/target/loop.c
+++ b/drivers/nvme/target/loop.c
@@ -396,7 +396,7 @@ static int nvme_loop_configure_admin_queue(struct nvme_loop_ctrl *ctrl)
 
        blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);
 
-       error = nvme_init_identify(&ctrl->ctrl);
+       error = nvme_init_ctrl_finish(&ctrl->ctrl);
        if (error)
                goto out_cleanup_queue;