Merge tag 'char-misc-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[linux-2.6-block.git] / drivers / crypto / ux500 / hash / hash_core.c

diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
index b141b74a084e4ad0360efeece96a193a5a650474..633321a8dd034390b7d809aaeef792e8d971a21b 100644 (file)
--- a/drivers/crypto/ux500/hash/hash_core.c
+++ b/drivers/crypto/ux500/hash/hash_core.c
@@ -1525,8 +1525,7 @@ static struct hash_algo_template hash_algs[] = {
                        .halg.base = {
                                .cra_name = "sha1",
                                .cra_driver_name = "sha1-ux500",
-                               .cra_flags = (CRYPTO_ALG_TYPE_AHASH |
-                                             CRYPTO_ALG_ASYNC),
+                               .cra_flags = CRYPTO_ALG_ASYNC,
                                .cra_blocksize = SHA1_BLOCK_SIZE,
                                .cra_ctxsize = sizeof(struct hash_ctx),
                                .cra_init = hash_cra_init,
@@ -1549,11 +1548,9 @@ static struct hash_algo_template hash_algs[] = {
                        .halg.base = {
                                .cra_name = "sha256",
                                .cra_driver_name = "sha256-ux500",
-                               .cra_flags = (CRYPTO_ALG_TYPE_AHASH |
-                                             CRYPTO_ALG_ASYNC),
+                               .cra_flags = CRYPTO_ALG_ASYNC,
                                .cra_blocksize = SHA256_BLOCK_SIZE,
                                .cra_ctxsize = sizeof(struct hash_ctx),
-                               .cra_type = &crypto_ahash_type,
                                .cra_init = hash_cra_init,
                                .cra_module = THIS_MODULE,
                        }
@@ -1575,11 +1572,9 @@ static struct hash_algo_template hash_algs[] = {
                        .halg.base = {
                                .cra_name = "hmac(sha1)",
                                .cra_driver_name = "hmac-sha1-ux500",
-                               .cra_flags = (CRYPTO_ALG_TYPE_AHASH |
-                                             CRYPTO_ALG_ASYNC),
+                               .cra_flags = CRYPTO_ALG_ASYNC,
                                .cra_blocksize = SHA1_BLOCK_SIZE,
                                .cra_ctxsize = sizeof(struct hash_ctx),
-                               .cra_type = &crypto_ahash_type,
                                .cra_init = hash_cra_init,
                                .cra_module = THIS_MODULE,
                        }
@@ -1601,11 +1596,9 @@ static struct hash_algo_template hash_algs[] = {
                        .halg.base = {
                                .cra_name = "hmac(sha256)",
                                .cra_driver_name = "hmac-sha256-ux500",
-                               .cra_flags = (CRYPTO_ALG_TYPE_AHASH |
-                                             CRYPTO_ALG_ASYNC),
+                               .cra_flags = CRYPTO_ALG_ASYNC,
                                .cra_blocksize = SHA256_BLOCK_SIZE,
                                .cra_ctxsize = sizeof(struct hash_ctx),
-                               .cra_type = &crypto_ahash_type,
                                .cra_init = hash_cra_init,
                                .cra_module = THIS_MODULE,
                        }