crypto: arm64/sha1-ce - clean up backwards function names

In the Linux kernel, a function whose name has two leading underscores
is conventionally called by the same-named function without leading
underscores -- not the other way around.  __sha1_ce_transform() got this
backwards.  Fix this.  No change in behavior.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm64/crypto/sha1-ce-core.S b/arch/arm64/crypto/sha1-ce-core.S
index 889ca0f8972b3736c044a1f80bdccf5ddc41e4df..9b1f2d82a6feae09aa7bd4b0f25a82918d515db5 100644 (file)
--- a/arch/arm64/crypto/sha1-ce-core.S
+++ b/arch/arm64/crypto/sha1-ce-core.S
@@ -62,10 +62,10 @@
        .endm
 
        /*
-        * int sha1_ce_transform(struct sha1_ce_state *sst, u8 const *src,
-        *                       int blocks)
+        * int __sha1_ce_transform(struct sha1_ce_state *sst, u8 const *src,
+        *                         int blocks)
         */
-SYM_FUNC_START(sha1_ce_transform)
+SYM_FUNC_START(__sha1_ce_transform)
        /* load round constants */
        loadrc          k0.4s, 0x5a827999, w6
        loadrc          k1.4s, 0x6ed9eba1, w6
@@ -147,4 +147,4 @@ CPU_LE(     rev32           v11.16b, v11.16b        )
        str             dgb, [x0, #16]
        mov             w0, w2
        ret
-SYM_FUNC_END(sha1_ce_transform)
+SYM_FUNC_END(__sha1_ce_transform)

diff --git a/arch/arm64/crypto/sha1-ce-glue.c b/arch/arm64/crypto/sha1-ce-glue.c
index 71fa4f1122d747b9d67fd0b95944609a89aadad5..1dd93e1fcb39a276a7be635878986c907d63afaf 100644 (file)
--- a/arch/arm64/crypto/sha1-ce-glue.c
+++ b/arch/arm64/crypto/sha1-ce-glue.c
@@ -29,18 +29,19 @@ struct sha1_ce_state {
 extern const u32 sha1_ce_offsetof_count;
 extern const u32 sha1_ce_offsetof_finalize;
 
-asmlinkage int sha1_ce_transform(struct sha1_ce_state *sst, u8 const *src,
-                                int blocks);
+asmlinkage int __sha1_ce_transform(struct sha1_ce_state *sst, u8 const *src,
+                                  int blocks);
 
-static void __sha1_ce_transform(struct sha1_state *sst, u8 const *src,
-                               int blocks)
+static void sha1_ce_transform(struct sha1_state *sst, u8 const *src,
+                             int blocks)
 {
        while (blocks) {
                int rem;
 
                kernel_neon_begin();
-               rem = sha1_ce_transform(container_of(sst, struct sha1_ce_state,
-                                                    sst), src, blocks);
+               rem = __sha1_ce_transform(container_of(sst,
+                                                      struct sha1_ce_state,
+                                                      sst), src, blocks);
                kernel_neon_end();
                src += (blocks - rem) * SHA1_BLOCK_SIZE;
                blocks = rem;
@@ -59,7 +60,7 @@ static int sha1_ce_update(struct shash_desc *desc, const u8 *data,
                return crypto_sha1_update(desc, data, len);
 
        sctx->finalize = 0;
-       sha1_base_do_update(desc, data, len, __sha1_ce_transform);
+       sha1_base_do_update(desc, data, len, sha1_ce_transform);
 
        return 0;
 }
@@ -79,9 +80,9 @@ static int sha1_ce_finup(struct shash_desc *desc, const u8 *data,
         */
        sctx->finalize = finalize;
 
-       sha1_base_do_update(desc, data, len, __sha1_ce_transform);
+       sha1_base_do_update(desc, data, len, sha1_ce_transform);
        if (!finalize)
-               sha1_base_do_finalize(desc, __sha1_ce_transform);
+               sha1_base_do_finalize(desc, sha1_ce_transform);
        return sha1_base_finish(desc, out);
 }
 
@@ -93,7 +94,7 @@ static int sha1_ce_final(struct shash_desc *desc, u8 *out)
                return crypto_sha1_finup(desc, NULL, 0, out);
 
        sctx->finalize = 0;
-       sha1_base_do_finalize(desc, __sha1_ce_transform);
+       sha1_base_do_finalize(desc, sha1_ce_transform);
        return sha1_base_finish(desc, out);
 }