From: Kanchan Joshi <joshi.k@samsung.com>
Date: Tue, 9 Mar 2021 00:48:03 +0530
Subject: nvme: use NVME_CTRL_CMIC_ANA macro
Patch-mainline: v5.13-rc1
Git-commit: 2bd643079ec1c44fac66838c27b993b78e8930a7
References: bsc#1184259, bsc#1178612, bsc#1186155

Use the proper macro instead of hard-coded value.

Signed-off-by: Kanchan Joshi <joshi.k@samsung.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Martin Wilck <mwilck@suse.com>
---
 drivers/nvme/host/nvme.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -740,7 +740,7 @@ static inline void nvme_trace_bio_comple
 static inline int nvme_mpath_init(struct nvme_ctrl *ctrl,
 		struct nvme_id_ctrl *id)
 {
-	if (ctrl->subsys->cmic & (1 << 3))
+	if (ctrl->subsys->cmic & NVME_CTRL_CMIC_ANA)
 		dev_warn(ctrl->device,
 "Please enable CONFIG_NVME_MULTIPATH for full support of multi-port devices.\n");
 	return 0;