Commit 2ba8cf91 authored by Damien Le Moal's avatar Damien Le Moal Committed by Keith Busch
Browse files

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: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent d422247d

drivers/nvme/target/nvmet.h

+7 −7
Original line number Diff line number Diff line
@@ -784,37 +784,37 @@ u16 nvmet_report_invalid_opcode(struct nvmet_req *req); 


static inline bool nvmet_cc_en(u32 cc)

{

	return (cc >> NVME_CC_EN_SHIFT) & 0x1;

	return (cc & NVME_CC_ENABLE) >> NVME_CC_EN_SHIFT;

}



static inline u8 nvmet_cc_css(u32 cc)

{

	return (cc >> NVME_CC_CSS_SHIFT) & 0x7;

	return (cc & NVME_CC_CSS_MASK) >> NVME_CC_CSS_SHIFT;

}



static inline u8 nvmet_cc_mps(u32 cc)

{

	return (cc >> NVME_CC_MPS_SHIFT) & 0xf;

	return (cc & NVME_CC_MPS_MASK) >> NVME_CC_MPS_SHIFT;

}



static inline u8 nvmet_cc_ams(u32 cc)

{

	return (cc >> NVME_CC_AMS_SHIFT) & 0x7;

	return (cc & NVME_CC_AMS_MASK) >> NVME_CC_AMS_SHIFT;

}



static inline u8 nvmet_cc_shn(u32 cc)

{

	return (cc >> NVME_CC_SHN_SHIFT) & 0x3;

	return (cc & NVME_CC_SHN_MASK) >> NVME_CC_SHN_SHIFT;

}



static inline u8 nvmet_cc_iosqes(u32 cc)

{

	return (cc >> NVME_CC_IOSQES_SHIFT) & 0xf;

	return (cc & NVME_CC_IOSQES_MASK) >> NVME_CC_IOSQES_SHIFT;

}



static inline u8 nvmet_cc_iocqes(u32 cc)

{

	return (cc >> NVME_CC_IOCQES_SHIFT) & 0xf;

	return (cc & NVME_CC_IOCQES_MASK) >> NVME_CC_IOCQES_SHIFT;

}



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