10 files changed, 8 insertions, 15 deletions

diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
index ad47abd08630..c54cb26eb7f5 100644
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
@@ -1035,7 +1035,6 @@ static struct aead_alg gcm_aes_aead = {
         .chunksize              = AES_BLOCK_SIZE,
 
         .base                   = {
-                .cra_flags              = CRYPTO_ALG_TYPE_AEAD,
                 .cra_blocksize          = 1,
                 .cra_ctxsize            = sizeof(struct s390_aes_ctx),
                 .cra_priority           = 900,
diff --git a/crypto/aegis128.c b/crypto/aegis128.c
index 38271303ce16..c22f4414856d 100644
--- a/crypto/aegis128.c
+++ b/crypto/aegis128.c
@@ -429,7 +429,6 @@ static struct aead_alg crypto_aegis128_alg = {
         .chunksize = AEGIS_BLOCK_SIZE,
 
         .base = {
-                .cra_flags = CRYPTO_ALG_TYPE_AEAD,
                 .cra_blocksize = 1,
                 .cra_ctxsize = sizeof(struct aegis_ctx),
                 .cra_alignmask = 0,
diff --git a/crypto/aegis128l.c b/crypto/aegis128l.c
index 64dc2654b863..b6fb21ebdc3e 100644
--- a/crypto/aegis128l.c
+++ b/crypto/aegis128l.c
@@ -493,7 +493,6 @@ static struct aead_alg crypto_aegis128l_alg = {
         .chunksize = AEGIS128L_CHUNK_SIZE,
 
         .base = {
-                .cra_flags = CRYPTO_ALG_TYPE_AEAD,
                 .cra_blocksize = 1,
                 .cra_ctxsize = sizeof(struct aegis_ctx),
                 .cra_alignmask = 0,
diff --git a/crypto/aegis256.c b/crypto/aegis256.c
index a489d741d33a..11f0f8ec9c7c 100644
--- a/crypto/aegis256.c
+++ b/crypto/aegis256.c
@@ -444,7 +444,6 @@ static struct aead_alg crypto_aegis256_alg = {
         .chunksize = AEGIS_BLOCK_SIZE,
 
         .base = {
-                .cra_flags = CRYPTO_ALG_TYPE_AEAD,
                 .cra_blocksize = 1,
                 .cra_ctxsize = sizeof(struct aegis_ctx),
                 .cra_alignmask = 0,
diff --git a/crypto/morus1280.c b/crypto/morus1280.c
index 6180b2557836..d057cf5ac4a8 100644
--- a/crypto/morus1280.c
+++ b/crypto/morus1280.c
@@ -514,7 +514,6 @@ static struct aead_alg crypto_morus1280_alg = {
         .chunksize = MORUS1280_BLOCK_SIZE,
 
         .base = {
-                .cra_flags = CRYPTO_ALG_TYPE_AEAD,
                 .cra_blocksize = 1,
                 .cra_ctxsize = sizeof(struct morus1280_ctx),
                 .cra_alignmask = 0,
diff --git a/crypto/morus640.c b/crypto/morus640.c
index 9fbcde307daf..5c48a7cb899e 100644
--- a/crypto/morus640.c
+++ b/crypto/morus640.c
@@ -510,7 +510,6 @@ static struct aead_alg crypto_morus640_alg = {
         .chunksize = MORUS640_BLOCK_SIZE,
 
         .base = {
-                .cra_flags = CRYPTO_ALG_TYPE_AEAD,
                 .cra_blocksize = 1,
                 .cra_ctxsize = sizeof(struct morus640_ctx),
                 .cra_alignmask = 0,
diff --git a/drivers/crypto/axis/artpec6_crypto.c b/drivers/crypto/axis/artpec6_crypto.c
index 049af6de3cb6..59392178d8bc 100644
--- a/drivers/crypto/axis/artpec6_crypto.c
+++ b/drivers/crypto/axis/artpec6_crypto.c
@@ -2964,7 +2964,7 @@ static struct aead_alg aead_algos[] = {
                         .cra_name = "gcm(aes)",
                         .cra_driver_name = "artpec-gcm-aes",
                         .cra_priority = 300,
-                        .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC |
+                        .cra_flags = CRYPTO_ALG_ASYNC |
                                      CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = 1,
                         .cra_ctxsize = sizeof(struct artpec6_cryptotfm_context),
diff --git a/drivers/crypto/bcm/cipher.c b/drivers/crypto/bcm/cipher.c
index 4e2babd6b89d..2d1f1db9f807 100644
--- a/drivers/crypto/bcm/cipher.c
+++ b/drivers/crypto/bcm/cipher.c
@@ -4689,7 +4689,7 @@ static int spu_register_aead(struct iproc_alg_s *driver_alg)
         aead->base.cra_ctxsize = sizeof(struct iproc_ctx_s);
         INIT_LIST_HEAD(&aead->base.cra_list);
 
-        aead->base.cra_flags |= CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC;
+        aead->base.cra_flags |= CRYPTO_ALG_ASYNC;
         /* setkey set in alg initialization */
         aead->setauthsize = aead_setauthsize;
         aead->encrypt = aead_encrypt;
diff --git a/drivers/crypto/chelsio/chcr_algo.c b/drivers/crypto/chelsio/chcr_algo.c
index 915b1500393c..5c539af8ed60 100644
--- a/drivers/crypto/chelsio/chcr_algo.c
+++ b/drivers/crypto/chelsio/chcr_algo.c
@@ -4236,8 +4236,7 @@ static int chcr_register_alg(void)
                         break;
                 case CRYPTO_ALG_TYPE_AEAD:
                         driver_algs[i].alg.aead.base.cra_flags =
-                                CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC |
-                                CRYPTO_ALG_NEED_FALLBACK;
+                                CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK;
                         driver_algs[i].alg.aead.encrypt = chcr_aead_encrypt;
                         driver_algs[i].alg.aead.decrypt = chcr_aead_decrypt;
                         driver_algs[i].alg.aead.init = chcr_aead_cra_init;
diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c b/drivers/crypto/inside-secure/safexcel_cipher.c
index 9d292427a488..19024500a895 100644
--- a/drivers/crypto/inside-secure/safexcel_cipher.c
+++ b/drivers/crypto/inside-secure/safexcel_cipher.c
@@ -1186,7 +1186,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_cbc_aes = {
                         .cra_name = "authenc(hmac(sha1),cbc(aes))",
                         .cra_driver_name = "safexcel-authenc-hmac-sha1-cbc-aes",
                         .cra_priority = 300,
-                        .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC |
+                        .cra_flags = CRYPTO_ALG_ASYNC |
                                      CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = AES_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct safexcel_cipher_ctx),
@@ -1221,7 +1221,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha256_cbc_aes = {
                         .cra_name = "authenc(hmac(sha256),cbc(aes))",
                         .cra_driver_name = "safexcel-authenc-hmac-sha256-cbc-aes",
                         .cra_priority = 300,
-                        .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC |
+                        .cra_flags = CRYPTO_ALG_ASYNC |
                                      CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = AES_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct safexcel_cipher_ctx),
@@ -1256,7 +1256,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha224_cbc_aes = {
                         .cra_name = "authenc(hmac(sha224),cbc(aes))",
                         .cra_driver_name = "safexcel-authenc-hmac-sha224-cbc-aes",
                         .cra_priority = 300,
-                        .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC |
+                        .cra_flags = CRYPTO_ALG_ASYNC |
                                      CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = AES_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct safexcel_cipher_ctx),
@@ -1291,7 +1291,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha512_cbc_aes = {
                         .cra_name = "authenc(hmac(sha512),cbc(aes))",
                         .cra_driver_name = "safexcel-authenc-hmac-sha512-cbc-aes",
                         .cra_priority = 300,
-                        .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC |
+                        .cra_flags = CRYPTO_ALG_ASYNC |
                                      CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = AES_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct safexcel_cipher_ctx),
@@ -1326,7 +1326,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha384_cbc_aes = {
                         .cra_name = "authenc(hmac(sha384),cbc(aes))",
                         .cra_driver_name = "safexcel-authenc-hmac-sha384-cbc-aes",
                         .cra_priority = 300,
-                        .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC |
+                        .cra_flags = CRYPTO_ALG_ASYNC |
                                      CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = AES_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct safexcel_cipher_ctx),