nvme: rename AMS symbolic constants to fit specification

Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index b2daeafbeadd7252dd9055ef9d5d4909faabb5bc..1db8de0bee876646a2ceb7c701dc22575d416630 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1445,7 +1445,7 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl, u64 cap)
 
        ctrl->ctrl_config = NVME_CC_CSS_NVM;
        ctrl->ctrl_config |= (page_shift - 12) << NVME_CC_MPS_SHIFT;
-       ctrl->ctrl_config |= NVME_CC_ARB_RR | NVME_CC_SHN_NONE;
+       ctrl->ctrl_config |= NVME_CC_AMS_RR | NVME_CC_SHN_NONE;
        ctrl->ctrl_config |= NVME_CC_IOSQES | NVME_CC_IOCQES;
        ctrl->ctrl_config |= NVME_CC_ENABLE;
 

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 7b4322dc297542d402217d2c3c72f18a937f4c4e..05560c2ecc838d5a048bf48db297c33a1fa707e8 100644 (file)
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -142,9 +142,9 @@ enum {
        NVME_CC_SHN_SHIFT       = 14,
        NVME_CC_IOSQES_SHIFT    = 16,
        NVME_CC_IOCQES_SHIFT    = 20,
-       NVME_CC_ARB_RR          = 0 << NVME_CC_AMS_SHIFT,
-       NVME_CC_ARB_WRRU        = 1 << NVME_CC_AMS_SHIFT,
-       NVME_CC_ARB_VS          = 7 << NVME_CC_AMS_SHIFT,
+       NVME_CC_AMS_RR          = 0 << NVME_CC_AMS_SHIFT,
+       NVME_CC_AMS_WRRU        = 1 << NVME_CC_AMS_SHIFT,
+       NVME_CC_AMS_VS          = 7 << NVME_CC_AMS_SHIFT,
        NVME_CC_SHN_NONE        = 0 << NVME_CC_SHN_SHIFT,
        NVME_CC_SHN_NORMAL      = 1 << NVME_CC_SHN_SHIFT,
        NVME_CC_SHN_ABRUPT      = 2 << NVME_CC_SHN_SHIFT,