crypto: sha-mb - Cleanup code to use || instead of |

 for condition comparison and cleanup multiline comment style

In sha*_ctx_mgr_submit, we currently use the | operator instead of ||
((ctx->partial_block_buffer_length) | (len < SHA1_BLOCK_SIZE))

Switching it to || and remove extraneous paranthesis to
adhere to coding style.

Also cleanup inconsistent multiline comment style.

Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/x86/crypto/sha1-mb/sha1_mb.c b/arch/x86/crypto/sha1-mb/sha1_mb.c
index 561b286..9e5b671 100644 (file)
--- a/arch/x86/crypto/sha1-mb/sha1_mb.c
+++ b/arch/x86/crypto/sha1-mb/sha1_mb.c
@@ -304,7 +304,7 @@ static struct sha1_hash_ctx *sha1_ctx_mgr_submit(struct sha1_ctx_mgr *mgr,
         * Or if the user's buffer contains less than a whole block,
         * append as much as possible to the extra block.
         */
-       if ((ctx->partial_block_buffer_length) | (len < SHA1_BLOCK_SIZE)) {
+       if (ctx->partial_block_buffer_length || len < SHA1_BLOCK_SIZE) {
                /*
                 * Compute how many bytes to copy from user buffer into
                 * extra block

diff --git a/arch/x86/crypto/sha256-mb/sha256_mb.c b/arch/x86/crypto/sha256-mb/sha256_mb.c
index c9d5dcc..89fa85e 100644 (file)
--- a/arch/x86/crypto/sha256-mb/sha256_mb.c
+++ b/arch/x86/crypto/sha256-mb/sha256_mb.c
@@ -283,7 +283,8 @@ static struct sha256_hash_ctx *sha256_ctx_mgr_submit(struct sha256_ctx_mgr *mgr,
        ctx->incoming_buffer = buffer;
        ctx->incoming_buffer_length = len;
 
-       /* Store the user's request flags and mark this ctx as currently
+       /*
+        * Store the user's request flags and mark this ctx as currently
         * being processed.
         */
        ctx->status = (flags & HASH_LAST) ?
@@ -299,8 +300,9 @@ static struct sha256_hash_ctx *sha256_ctx_mgr_submit(struct sha256_ctx_mgr *mgr,
         * Or if the user's buffer contains less than a whole block,
         * append as much as possible to the extra block.
         */
-       if ((ctx->partial_block_buffer_length) | (len < SHA256_BLOCK_SIZE)) {
-               /* Compute how many bytes to copy from user buffer into
+       if (ctx->partial_block_buffer_length || len < SHA256_BLOCK_SIZE) {
+               /*
+                * Compute how many bytes to copy from user buffer into
                 * extra block
                 */
                uint32_t copy_len = SHA256_BLOCK_SIZE -
@@ -323,7 +325,8 @@ static struct sha256_hash_ctx *sha256_ctx_mgr_submit(struct sha256_ctx_mgr *mgr,
                /* The extra block should never contain more than 1 block */
                assert(ctx->partial_block_buffer_length <= SHA256_BLOCK_SIZE);
 
-               /* If the extra block buffer contains exactly 1 block,
+               /*
+                * If the extra block buffer contains exactly 1 block,
                 * it can be hashed.
                 */
                if (ctx->partial_block_buffer_length >= SHA256_BLOCK_SIZE) {

diff --git a/arch/x86/crypto/sha512-mb/sha512_mb.c b/arch/x86/crypto/sha512-mb/sha512_mb.c
index 676f0f2..f4cf5b7 100644 (file)
--- a/arch/x86/crypto/sha512-mb/sha512_mb.c
+++ b/arch/x86/crypto/sha512-mb/sha512_mb.c
@@ -253,7 +253,8 @@ static struct sha512_hash_ctx
                                          int flags)
 {
        if (flags & (~HASH_ENTIRE)) {
-               /* User should not pass anything other than FIRST, UPDATE, or
+               /*
+                * User should not pass anything other than FIRST, UPDATE, or
                 * LAST
                 */
                ctx->error = HASH_CTX_ERROR_INVALID_FLAGS;
@@ -284,7 +285,8 @@ static struct sha512_hash_ctx
                ctx->partial_block_buffer_length = 0;
        }
 
-       /* If we made it here, there were no errors during this call to
+       /*
+        * If we made it here, there were no errors during this call to
         * submit
         */
        ctx->error = HASH_CTX_ERROR_NONE;
@@ -293,7 +295,8 @@ static struct sha512_hash_ctx
        ctx->incoming_buffer = buffer;
        ctx->incoming_buffer_length = len;
 
-       /* Store the user's request flags and mark this ctx as currently being
+       /*
+        * Store the user's request flags and mark this ctx as currently being
         * processed.
         */
        ctx->status = (flags & HASH_LAST) ?
@@ -309,7 +312,7 @@ static struct sha512_hash_ctx
         * Or if the user's buffer contains less than a whole block,
         * append as much as possible to the extra block.
         */
-       if ((ctx->partial_block_buffer_length) | (len < SHA512_BLOCK_SIZE)) {
+       if (ctx->partial_block_buffer_length || len < SHA512_BLOCK_SIZE) {
                /* Compute how many bytes to copy from user buffer into extra
                 * block
                 */