Skip to content

Commit 2ba8cf9

Browse files
damien-lemoalkeithbusch
authored andcommitted
nvmet: Use enum definitions instead of hardcoded values
Change the definition of the inline functions nvmet_cc_en(), nvmet_cc_css(), nvmet_cc_mps(), nvmet_cc_ams(), nvmet_cc_shn(), nvmet_cc_iosqes(), and nvmet_cc_iocqes() to use the enum difinitions in include/linux/nvme.h instead of hardcoded values. Signed-off-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Keith Busch <kbusch@kernel.org>
1 parent d422247 commit 2ba8cf9

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/nvme/target/nvmet.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -784,37 +784,37 @@ u16 nvmet_report_invalid_opcode(struct nvmet_req *req);
784784

785785
static inline bool nvmet_cc_en(u32 cc)
786786
{
787-
return (cc >> NVME_CC_EN_SHIFT) & 0x1;
787+
return (cc & NVME_CC_ENABLE) >> NVME_CC_EN_SHIFT;
788788
}
789789

790790
static inline u8 nvmet_cc_css(u32 cc)
791791
{
792-
return (cc >> NVME_CC_CSS_SHIFT) & 0x7;
792+
return (cc & NVME_CC_CSS_MASK) >> NVME_CC_CSS_SHIFT;
793793
}
794794

795795
static inline u8 nvmet_cc_mps(u32 cc)
796796
{
797-
return (cc >> NVME_CC_MPS_SHIFT) & 0xf;
797+
return (cc & NVME_CC_MPS_MASK) >> NVME_CC_MPS_SHIFT;
798798
}
799799

800800
static inline u8 nvmet_cc_ams(u32 cc)
801801
{
802-
return (cc >> NVME_CC_AMS_SHIFT) & 0x7;
802+
return (cc & NVME_CC_AMS_MASK) >> NVME_CC_AMS_SHIFT;
803803
}
804804

805805
static inline u8 nvmet_cc_shn(u32 cc)
806806
{
807-
return (cc >> NVME_CC_SHN_SHIFT) & 0x3;
807+
return (cc & NVME_CC_SHN_MASK) >> NVME_CC_SHN_SHIFT;
808808
}
809809

810810
static inline u8 nvmet_cc_iosqes(u32 cc)
811811
{
812-
return (cc >> NVME_CC_IOSQES_SHIFT) & 0xf;
812+
return (cc & NVME_CC_IOSQES_MASK) >> NVME_CC_IOSQES_SHIFT;
813813
}
814814

815815
static inline u8 nvmet_cc_iocqes(u32 cc)
816816
{
817-
return (cc >> NVME_CC_IOCQES_SHIFT) & 0xf;
817+
return (cc & NVME_CC_IOCQES_MASK) >> NVME_CC_IOCQES_SHIFT;
818818
}
819819

820820
/* Convert a 32-bit number to a 16-bit 0's based number */

0 commit comments

Comments
 (0)