[1/2] common/cpt: remove redundant CPT_BYTE_* macros

Message ID 1600252620-18201-1-git-send-email-marchana@marvell.com (mailing list archive)
State Accepted, archived
Delegated to: akhil goyal
Headers
Series [1/2] common/cpt: remove redundant CPT_BYTE_* macros |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Archana Muniganti Sept. 16, 2020, 10:36 a.m. UTC
  The macros can be replaced with actual constants.

Signed-off-by: Archana Muniganti <marchana@marvell.com>
---
 drivers/common/cpt/cpt_mcode_defines.h |  3 ---
 drivers/common/cpt/cpt_ucode.h         | 14 +++++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)
  

Comments

Akhil Goyal Oct. 9, 2020, 12:26 p.m. UTC | #1
> The macros can be replaced with actual constants.
> 
> Signed-off-by: Archana Muniganti <marchana@marvell.com>
> ---
Series Applied to dpdk-next-crypto

Thanks.
  

Patch

diff --git a/drivers/common/cpt/cpt_mcode_defines.h b/drivers/common/cpt/cpt_mcode_defines.h
index fd306ab..ee2c7f3 100644
--- a/drivers/common/cpt/cpt_mcode_defines.h
+++ b/drivers/common/cpt/cpt_mcode_defines.h
@@ -38,9 +38,6 @@ 
 #define CPT_BLOCK_TYPE1 0
 #define CPT_BLOCK_TYPE2 1
 
-#define CPT_BYTE_16		16
-#define CPT_BYTE_24		24
-#define CPT_BYTE_32		32
 #define CPT_MAX_SG_IN_OUT_CNT	32
 #define CPT_MAX_SG_CNT		(CPT_MAX_SG_IN_OUT_CNT/2)
 
diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h
index 44067cf..0cfba0b 100644
--- a/drivers/common/cpt/cpt_ucode.h
+++ b/drivers/common/cpt/cpt_ucode.h
@@ -47,9 +47,9 @@ 
 cpt_fc_ciph_validate_key_aes(uint16_t key_len)
 {
 	switch (key_len) {
-	case CPT_BYTE_16:
-	case CPT_BYTE_24:
-	case CPT_BYTE_32:
+	case 16:
+	case 24:
+	case 32:
 		return 0;
 	default:
 		return -1;
@@ -82,7 +82,7 @@ 
 		break;
 	case AES_XTS:
 		key_len = key_len / 2;
-		if (unlikely(key_len == CPT_BYTE_24)) {
+		if (unlikely(key_len == 24)) {
 			CPT_LOG_DP_ERR("Invalid AES key len for XTS");
 			return -1;
 		}
@@ -128,13 +128,13 @@ 
 {
 	mc_aes_type_t aes_key_type = 0;
 	switch (key_len) {
-	case CPT_BYTE_16:
+	case 16:
 		aes_key_type = AES_128_BIT;
 		break;
-	case CPT_BYTE_24:
+	case 24:
 		aes_key_type = AES_192_BIT;
 		break;
-	case CPT_BYTE_32:
+	case 32:
 		aes_key_type = AES_256_BIT;
 		break;
 	default: