crypto: geniv - remove unneeded arguments from aead_geniv_alloc()

The type and mask arguments to aead_geniv_alloc() are always 0, so
remove them.

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

diff --git a/crypto/echainiv.c b/crypto/echainiv.c
index 4a2f02b..6968666 100644 (file)
--- a/crypto/echainiv.c
+++ b/crypto/echainiv.c
@@ -115,7 +115,7 @@ static int echainiv_aead_create(struct crypto_template *tmpl,
        struct aead_instance *inst;
        int err;
 
-       inst = aead_geniv_alloc(tmpl, tb, 0, 0);
+       inst = aead_geniv_alloc(tmpl, tb);
 
        if (IS_ERR(inst))
                return PTR_ERR(inst);

diff --git a/crypto/geniv.c b/crypto/geniv.c
index 6a90c52..07496c8 100644 (file)
--- a/crypto/geniv.c
+++ b/crypto/geniv.c
@@ -39,7 +39,7 @@ static void aead_geniv_free(struct aead_instance *inst)
 }
 
 struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
-                                      struct rtattr **tb, u32 type, u32 mask)
+                                      struct rtattr **tb)
 {
        struct crypto_aead_spawn *spawn;
        struct crypto_attr_type *algt;
@@ -47,6 +47,7 @@ struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
        struct aead_alg *alg;
        unsigned int ivsize;
        unsigned int maxauthsize;
+       u32 mask;
        int err;
 
        algt = crypto_get_attr_type(tb);
@@ -63,10 +64,10 @@ struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
        spawn = aead_instance_ctx(inst);
 
        /* Ignore async algorithms if necessary. */
-       mask |= crypto_requires_sync(algt->type, algt->mask);
+       mask = crypto_requires_sync(algt->type, algt->mask);
 
        err = crypto_grab_aead(spawn, aead_crypto_instance(inst),
-                              crypto_attr_alg_name(tb[1]), type, mask);
+                              crypto_attr_alg_name(tb[1]), 0, mask);
        if (err)
                goto err_free_inst;
 

diff --git a/crypto/seqiv.c b/crypto/seqiv.c
index f124b9b..e48f875 100644 (file)
--- a/crypto/seqiv.c
+++ b/crypto/seqiv.c
@@ -138,7 +138,7 @@ static int seqiv_aead_create(struct crypto_template *tmpl, struct rtattr **tb)
        struct aead_instance *inst;
        int err;
 
-       inst = aead_geniv_alloc(tmpl, tb, 0, 0);
+       inst = aead_geniv_alloc(tmpl, tb);
 
        if (IS_ERR(inst))
                return PTR_ERR(inst);

diff --git a/include/crypto/internal/geniv.h b/include/crypto/internal/geniv.h
index 229d376..7fd7126 100644 (file)
--- a/include/crypto/internal/geniv.h
+++ b/include/crypto/internal/geniv.h
@@ -20,7 +20,7 @@ struct aead_geniv_ctx {
 };
 
 struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
-                                      struct rtattr **tb, u32 type, u32 mask);
+                                      struct rtattr **tb);
 int aead_init_geniv(struct crypto_aead *tfm);
 void aead_exit_geniv(struct crypto_aead *tfm);