]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
crypto: s390 - Rename functions to avoid conflict with crypto/sha256.h
authorHans de Goede <hdegoede@redhat.com>
Sun, 1 Sep 2019 20:35:26 +0000 (22:35 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 5 Sep 2019 04:37:30 +0000 (14:37 +1000)
Rename static / file-local functions so that they do not conflict with
the functions declared in crypto/sha256.h.

This is a preparation patch for folding crypto/sha256.h into crypto/sha.h.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
arch/s390/crypto/sha256_s390.c

index af7505148f806ebd1286fa32e4c9f06e97d22499..b52c87e449398ff3ebf691a0431adfcecaf54566 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "sha.h"
 
-static int sha256_init(struct shash_desc *desc)
+static int s390_sha256_init(struct shash_desc *desc)
 {
        struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
 
@@ -60,7 +60,7 @@ static int sha256_import(struct shash_desc *desc, const void *in)
 
 static struct shash_alg sha256_alg = {
        .digestsize     =       SHA256_DIGEST_SIZE,
-       .init           =       sha256_init,
+       .init           =       s390_sha256_init,
        .update         =       s390_sha_update,
        .final          =       s390_sha_final,
        .export         =       sha256_export,
@@ -76,7 +76,7 @@ static struct shash_alg sha256_alg = {
        }
 };
 
-static int sha224_init(struct shash_desc *desc)
+static int s390_sha224_init(struct shash_desc *desc)
 {
        struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
 
@@ -96,7 +96,7 @@ static int sha224_init(struct shash_desc *desc)
 
 static struct shash_alg sha224_alg = {
        .digestsize     =       SHA224_DIGEST_SIZE,
-       .init           =       sha224_init,
+       .init           =       s390_sha224_init,
        .update         =       s390_sha_update,
        .final          =       s390_sha_final,
        .export         =       sha256_export,