summaryrefslogtreecommitdiff
path: root/arch/x86/crypto/sha1-mb/sha1_mb.c
diff options
context:
space:
mode:
authorTim Chen <tim.c.chen@linux.intel.com>2016-07-08 16:28:03 (GMT)
committerHerbert Xu <herbert@gondor.apana.org.au>2016-07-12 05:02:00 (GMT)
commiteb9bc8e7afaa9f062105dad55ec1c0663d961bb3 (patch)
treeee3fdfcaa6e1dcbb0522bd8861ec26505c4d20b5 /arch/x86/crypto/sha1-mb/sha1_mb.c
parentbd76ad4abfdccd26a9ac11214aa715e83bc8e808 (diff)
downloadlinux-eb9bc8e7afaa9f062105dad55ec1c0663d961bb3.tar.xz
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>
Diffstat (limited to 'arch/x86/crypto/sha1-mb/sha1_mb.c')
-rw-r--r--arch/x86/crypto/sha1-mb/sha1_mb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/crypto/sha1-mb/sha1_mb.c b/arch/x86/crypto/sha1-mb/sha1_mb.c
index 561b286..9e5b671 100644
--- 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