nvmet: use macro definitions for setting cmic value

This makes the code more readable.

Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index dce53030b375aeaa08145f2011b3bd405dbb50f3..6e75890bc8d90f84ddd5fad2ecc51465c3e6263e 100644 (file)
--- a/drivers/nvme/target/admin-cmd.c
+++ b/drivers/nvme/target/admin-cmd.c
@@ -385,7 +385,8 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req)
         */
 
        /* we support multiple ports, multiples hosts and ANA: */
-       id->cmic = (1 << 0) | (1 << 1) | (1 << 3);
+       id->cmic = NVME_CTRL_CMIC_MULTI_PORT | NVME_CTRL_CMIC_MULTI_CTRL |
+               NVME_CTRL_CMIC_ANA;
 
        /* Limit MDTS according to transport capability */
        if (ctrl->ops->get_mdts)

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index ed2428918bca482f4f36563b36b28ace0a7f5640..357482dedb59932e78456061ec4916614daecc9f 100644 (file)
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -320,6 +320,7 @@ struct nvme_id_ctrl {
 };
 
 enum {
+       NVME_CTRL_CMIC_MULTI_PORT               = 1 << 0,
        NVME_CTRL_CMIC_MULTI_CTRL               = 1 << 1,
        NVME_CTRL_CMIC_ANA                      = 1 << 3,
        NVME_CTRL_ONCS_COMPARE                  = 1 << 0,