crypto: sahara - use BIT() macro

Where applicable, use BIT() macro instead of shift operation to improve
readability. No functional change.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c
index b024935f9d850d29668e93a3059b30ed590ebeea..ba7d3a917101f9a3876b6134aa7ac0d203e7a0cd 100644 (file)
--- a/drivers/crypto/sahara.c
+++ b/drivers/crypto/sahara.c
@@ -46,15 +46,15 @@
 
 #define SAHARA_HDR_BASE                                0x00800000
 #define SAHARA_HDR_SKHA_ALG_AES                        0
-#define SAHARA_HDR_SKHA_OP_ENC                 (1 << 2)
-#define SAHARA_HDR_SKHA_MODE_ECB               (0 << 3)
-#define SAHARA_HDR_SKHA_MODE_CBC               (1 << 3)
+#define SAHARA_HDR_SKHA_MODE_ECB               0
+#define SAHARA_HDR_SKHA_OP_ENC                 BIT(2)
+#define SAHARA_HDR_SKHA_MODE_CBC               BIT(3)
 #define SAHARA_HDR_FORM_DATA                   (5 << 16)
-#define SAHARA_HDR_FORM_KEY                    (8 << 16)
-#define SAHARA_HDR_LLO                         (1 << 24)
-#define SAHARA_HDR_CHA_SKHA                    (1 << 28)
-#define SAHARA_HDR_CHA_MDHA                    (2 << 28)
-#define SAHARA_HDR_PARITY_BIT                  (1 << 31)
+#define SAHARA_HDR_FORM_KEY                    BIT(19)
+#define SAHARA_HDR_LLO                         BIT(24)
+#define SAHARA_HDR_CHA_SKHA                    BIT(28)
+#define SAHARA_HDR_CHA_MDHA                    BIT(29)
+#define SAHARA_HDR_PARITY_BIT                  BIT(31)
 
 #define SAHARA_HDR_MDHA_SET_MODE_MD_KEY                0x20880000
 #define SAHARA_HDR_MDHA_SET_MODE_HASH          0x208D0000
@@ -64,14 +64,14 @@
 #define SAHARA_HDR_MDHA_ALG_MD5                        1
 #define SAHARA_HDR_MDHA_ALG_SHA256             2
 #define SAHARA_HDR_MDHA_ALG_SHA224             3
-#define SAHARA_HDR_MDHA_PDATA                  (1 << 2)
-#define SAHARA_HDR_MDHA_HMAC                   (1 << 3)
-#define SAHARA_HDR_MDHA_INIT                   (1 << 5)
-#define SAHARA_HDR_MDHA_IPAD                   (1 << 6)
-#define SAHARA_HDR_MDHA_OPAD                   (1 << 7)
-#define SAHARA_HDR_MDHA_SWAP                   (1 << 8)
-#define SAHARA_HDR_MDHA_MAC_FULL               (1 << 9)
-#define SAHARA_HDR_MDHA_SSL                    (1 << 10)
+#define SAHARA_HDR_MDHA_PDATA                  BIT(2)
+#define SAHARA_HDR_MDHA_HMAC                   BIT(3)
+#define SAHARA_HDR_MDHA_INIT                   BIT(5)
+#define SAHARA_HDR_MDHA_IPAD                   BIT(6)
+#define SAHARA_HDR_MDHA_OPAD                   BIT(7)
+#define SAHARA_HDR_MDHA_SWAP                   BIT(8)
+#define SAHARA_HDR_MDHA_MAC_FULL               BIT(9)
+#define SAHARA_HDR_MDHA_SSL                    BIT(10)
 
 /* SAHARA can only process one request at a time */
 #define SAHARA_QUEUE_LENGTH                    1
@@ -81,15 +81,15 @@
 #define SAHARA_REG_CONTROL                     0x08
 #define SAHARA_CONTROL_SET_THROTTLE(x)         (((x) & 0xff) << 24)
 #define SAHARA_CONTROL_SET_MAXBURST(x)         (((x) & 0xff) << 16)
-#define SAHARA_CONTROL_RNG_AUTORSD             (1 << 7)
-#define SAHARA_CONTROL_ENABLE_INT              (1 << 4)
+#define SAHARA_CONTROL_RNG_AUTORSD             BIT(7)
+#define SAHARA_CONTROL_ENABLE_INT              BIT(4)
 #define SAHARA_REG_CMD                         0x0C
-#define SAHARA_CMD_RESET                       (1 << 0)
-#define SAHARA_CMD_CLEAR_INT                   (1 << 8)
-#define SAHARA_CMD_CLEAR_ERR                   (1 << 9)
-#define SAHARA_CMD_SINGLE_STEP                 (1 << 10)
-#define SAHARA_CMD_MODE_BATCH                  (1 << 16)
-#define SAHARA_CMD_MODE_DEBUG                  (1 << 18)
+#define SAHARA_CMD_RESET                       BIT(0)
+#define SAHARA_CMD_CLEAR_INT                   BIT(8)
+#define SAHARA_CMD_CLEAR_ERR                   BIT(9)
+#define SAHARA_CMD_SINGLE_STEP                 BIT(10)
+#define SAHARA_CMD_MODE_BATCH                  BIT(16)
+#define SAHARA_CMD_MODE_DEBUG                  BIT(18)
 #define SAHARA_REG_STATUS                      0x10
 #define SAHARA_STATUS_GET_STATE(x)             ((x) & 0x7)
 #define SAHARA_STATE_IDLE                      0
@@ -97,25 +97,25 @@
 #define SAHARA_STATE_ERR                       2
 #define SAHARA_STATE_FAULT                     3
 #define SAHARA_STATE_COMPLETE                  4
-#define SAHARA_STATE_COMP_FLAG                 (1 << 2)
-#define SAHARA_STATUS_DAR_FULL                 (1 << 3)
-#define SAHARA_STATUS_ERROR                    (1 << 4)
-#define SAHARA_STATUS_SECURE                   (1 << 5)
-#define SAHARA_STATUS_FAIL                     (1 << 6)
-#define SAHARA_STATUS_INIT                     (1 << 7)
-#define SAHARA_STATUS_RNG_RESEED               (1 << 8)
-#define SAHARA_STATUS_ACTIVE_RNG               (1 << 9)
-#define SAHARA_STATUS_ACTIVE_MDHA              (1 << 10)
-#define SAHARA_STATUS_ACTIVE_SKHA              (1 << 11)
-#define SAHARA_STATUS_MODE_BATCH               (1 << 16)
-#define SAHARA_STATUS_MODE_DEDICATED           (1 << 17)
-#define SAHARA_STATUS_MODE_DEBUG               (1 << 18)
+#define SAHARA_STATE_COMP_FLAG                 BIT(2)
+#define SAHARA_STATUS_DAR_FULL                 BIT(3)
+#define SAHARA_STATUS_ERROR                    BIT(4)
+#define SAHARA_STATUS_SECURE                   BIT(5)
+#define SAHARA_STATUS_FAIL                     BIT(6)
+#define SAHARA_STATUS_INIT                     BIT(7)
+#define SAHARA_STATUS_RNG_RESEED               BIT(8)
+#define SAHARA_STATUS_ACTIVE_RNG               BIT(9)
+#define SAHARA_STATUS_ACTIVE_MDHA              BIT(10)
+#define SAHARA_STATUS_ACTIVE_SKHA              BIT(11)
+#define SAHARA_STATUS_MODE_BATCH               BIT(16)
+#define SAHARA_STATUS_MODE_DEDICATED           BIT(17)
+#define SAHARA_STATUS_MODE_DEBUG               BIT(18)
 #define SAHARA_STATUS_GET_ISTATE(x)            (((x) >> 24) & 0xff)
 #define SAHARA_REG_ERRSTATUS                   0x14
 #define SAHARA_ERRSTATUS_GET_SOURCE(x)         ((x) & 0xf)
 #define SAHARA_ERRSOURCE_CHA                   14
 #define SAHARA_ERRSOURCE_DMA                   15
-#define SAHARA_ERRSTATUS_DMA_DIR               (1 << 8)
+#define SAHARA_ERRSTATUS_DMA_DIR               BIT(8)
 #define SAHARA_ERRSTATUS_GET_DMASZ(x)          (((x) >> 9) & 0x3)
 #define SAHARA_ERRSTATUS_GET_DMASRC(x)         (((x) >> 13) & 0x7)
 #define SAHARA_ERRSTATUS_GET_CHASRC(x)         (((x) >> 16) & 0xfff)