crypto: artpec6 - use memcpy_and_pad to simplify prepare_hash

Use memcpy_and_pad() instead of memcpy() followed by memset() to
simplify artpec6_crypto_prepare_hash().

Also fix a duplicate word in a comment and remove a now-redundant one.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/axis/artpec6_crypto.c b/drivers/crypto/axis/artpec6_crypto.c
index b04d6379244ae8b25a3770ac60d846f09ec59e2b..a4793b76300cffd1b786ebd19d2c7873ed82c11d 100644 (file)
--- a/drivers/crypto/axis/artpec6_crypto.c
+++ b/drivers/crypto/axis/artpec6_crypto.c
@@ -1323,7 +1323,7 @@ static int artpec6_crypto_prepare_hash(struct ahash_request *areq)
 
        artpec6_crypto_init_dma_operation(common);
 
-       /* Upload HMAC key, must be first the first packet */
+       /* Upload HMAC key, it must be the first packet */
        if (req_ctx->hash_flags & HASH_FLAG_HMAC) {
                if (variant == ARTPEC6_CRYPTO) {
                        req_ctx->key_md = FIELD_PREP(A6_CRY_MD_OPER,
@@ -1333,11 +1333,8 @@ static int artpec6_crypto_prepare_hash(struct ahash_request *areq)
                                                     a7_regk_crypto_dlkey);
                }
 
-               /* Copy and pad up the key */
-               memcpy(req_ctx->key_buffer, ctx->hmac_key,
-                      ctx->hmac_key_length);
-               memset(req_ctx->key_buffer + ctx->hmac_key_length, 0,
-                      blocksize - ctx->hmac_key_length);
+               memcpy_and_pad(req_ctx->key_buffer, blocksize, ctx->hmac_key,
+                              ctx->hmac_key_length, 0);
 
                error = artpec6_crypto_setup_out_descr(common,
                                        (void *)&req_ctx->key_md,