These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / skein / skein_base.c

diff --git a/kernel/drivers/staging/skein/skein_base.c b/kernel/drivers/staging/skein/skein_base.c
index 7e700a6..25a01ca 100644 (file)
--- a/kernel/drivers/staging/skein/skein_base.c
+++ b/kernel/drivers/staging/skein/skein_base.c
@@ -75,8 +75,10 @@ int skein_256_init(struct skein_256_ctx *ctx, size_t hash_bit_len)
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
 /* init the context for a MAC and/or tree hash operation */
-/* [identical to skein_256_init() when key_bytes == 0 && \
- *     tree_info == SKEIN_CFG_TREE_INFO_SEQUENTIAL] */
+/*
+ * [identical to skein_256_init() when key_bytes == 0 && \
+ *     tree_info == SKEIN_CFG_TREE_INFO_SEQUENTIAL]
+ */
 int skein_256_init_ext(struct skein_256_ctx *ctx, size_t hash_bit_len,
                       u64 tree_info, const u8 *key, size_t key_bytes)
 {
@@ -86,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? */
@@ -301,8 +303,10 @@ int skein_512_init(struct skein_512_ctx *ctx, size_t hash_bit_len)
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
 /* init the context for a MAC and/or tree hash operation */
-/* [identical to skein_512_init() when key_bytes == 0 && \
- *     tree_info == SKEIN_CFG_TREE_INFO_SEQUENTIAL] */
+/*
+ * [identical to skein_512_init() when key_bytes == 0 && \
+ *     tree_info == SKEIN_CFG_TREE_INFO_SEQUENTIAL]
+ */
 int skein_512_init_ext(struct skein_512_ctx *ctx, size_t hash_bit_len,
                       u64 tree_info, const u8 *key, size_t key_bytes)
 {
@@ -312,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? */
@@ -520,8 +524,10 @@ int skein_1024_init(struct skein_1024_ctx *ctx, size_t hash_bit_len)
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
 /* init the context for a MAC and/or tree hash operation */
-/* [identical to skein_1024_init() when key_bytes == 0 && \
- *     tree_info == SKEIN_CFG_TREE_INFO_SEQUENTIAL] */
+/*
+ * [identical to skein_1024_init() when key_bytes == 0 && \
+ *     tree_info == SKEIN_CFG_TREE_INFO_SEQUENTIAL]
+ */
 int skein_1024_init_ext(struct skein_1024_ctx *ctx, size_t hash_bit_len,
                        u64 tree_info, const u8 *key, size_t key_bytes)
 {
@@ -531,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? */