summaryrefslogtreecommitdiffstats
path: root/drivers/staging/skein/skein_base.c
diff options
context:
space:
mode:
authorAybuke Ozdemir2015-10-13 22:55:07 +0200
committerGreg Kroah-Hartman2015-10-13 23:37:35 +0200
commit26368fd7048f2c26d5263a932614351f04436be7 (patch)
treedacab53551fd62a548cc1b9854678f4d86257f8b /drivers/staging/skein/skein_base.c
parentStaging: wilc1000: wilc_wlan_cfg: Remove unnecessary cast (diff)
downloadkernel-qcow2-linux-26368fd7048f2c26d5263a932614351f04436be7.tar.gz
kernel-qcow2-linux-26368fd7048f2c26d5263a932614351f04436be7.tar.xz
kernel-qcow2-linux-26368fd7048f2c26d5263a932614351f04436be7.zip
Staging: skein: Remove NULL comparison
Problem found using checkpatch.pl CHECK: Comparison to NULL could be written "key" Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/skein/skein_base.c')
-rw-r--r--drivers/staging/skein/skein_base.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/skein/skein_base.c b/drivers/staging/skein/skein_base.c
index bfb08fa4045c..25a01ca76953 100644
--- a/drivers/staging/skein/skein_base.c
+++ b/drivers/staging/skein/skein_base.c
@@ -88,7 +88,7 @@ int skein_256_init_ext(struct skein_256_ctx *ctx, size_t hash_bit_len,
} cfg; /* config block */
skein_assert_ret(hash_bit_len > 0, SKEIN_BAD_HASHLEN);
- skein_assert_ret(key_bytes == 0 || key != NULL, SKEIN_FAIL);
+ skein_assert_ret(key_bytes == 0 || key, SKEIN_FAIL);
/* compute the initial chaining values ctx->x[], based on key */
if (key_bytes == 0) { /* is there a key? */
@@ -316,7 +316,7 @@ int skein_512_init_ext(struct skein_512_ctx *ctx, size_t hash_bit_len,
} cfg; /* config block */
skein_assert_ret(hash_bit_len > 0, SKEIN_BAD_HASHLEN);
- skein_assert_ret(key_bytes == 0 || key != NULL, SKEIN_FAIL);
+ skein_assert_ret(key_bytes == 0 || key, SKEIN_FAIL);
/* compute the initial chaining values ctx->x[], based on key */
if (key_bytes == 0) { /* is there a key? */
@@ -537,7 +537,7 @@ int skein_1024_init_ext(struct skein_1024_ctx *ctx, size_t hash_bit_len,
} cfg; /* config block */
skein_assert_ret(hash_bit_len > 0, SKEIN_BAD_HASHLEN);
- skein_assert_ret(key_bytes == 0 || key != NULL, SKEIN_FAIL);
+ skein_assert_ret(key_bytes == 0 || key, SKEIN_FAIL);
/* compute the initial chaining values ctx->x[], based on key */
if (key_bytes == 0) { /* is there a key? */