crypto: algapi - remove crypto_template::{alloc,free}()

Now that all templates provide a ->create() method which creates an
instance, installs a strongly-typed ->free() method directly to it, and
registers it, the older ->alloc() and ->free() methods in
'struct crypto_template' are no longer used.  Remove them.

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

diff --git a/crypto/aead.c b/crypto/aead.c
index 02a0db0..7707d32 100644 (file)
--- a/crypto/aead.c
+++ b/crypto/aead.c
@@ -185,11 +185,6 @@ static void crypto_aead_free_instance(struct crypto_instance *inst)
 {
        struct aead_instance *aead = aead_instance(inst);
 
-       if (!aead->free) {
-               inst->tmpl->free(inst);
-               return;
-       }
-
        aead->free(aead);
 }
 

diff --git a/crypto/ahash.c b/crypto/ahash.c
index 61e374d..cd5d984 100644 (file)
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -515,11 +515,6 @@ static void crypto_ahash_free_instance(struct crypto_instance *inst)
 {
        struct ahash_instance *ahash = ahash_instance(inst);
 
-       if (!ahash->free) {
-               inst->tmpl->free(inst);
-               return;
-       }
-
        ahash->free(ahash);
 }
 

diff --git a/crypto/algapi.c b/crypto/algapi.c
index 7259279..69605e2 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -65,11 +65,6 @@ static int crypto_check_alg(struct crypto_alg *alg)
 
 static void crypto_free_instance(struct crypto_instance *inst)
 {
-       if (!inst->alg.cra_type->free) {
-               inst->tmpl->free(inst);
-               return;
-       }
-
        inst->alg.cra_type->free(inst);
 }
 

diff --git a/crypto/algboss.c b/crypto/algboss.c
index a62149d..535f1f8 100644 (file)
--- a/crypto/algboss.c
+++ b/crypto/algboss.c
@@ -58,7 +58,6 @@ static int cryptomgr_probe(void *data)
 {
        struct cryptomgr_param *param = data;
        struct crypto_template *tmpl;
-       struct crypto_instance *inst;
        int err;
 
        tmpl = crypto_lookup_template(param->template);
@@ -66,16 +65,7 @@ static int cryptomgr_probe(void *data)
                goto out;
 
        do {
-               if (tmpl->create) {
-                       err = tmpl->create(tmpl, param->tb);
-                       continue;
-               }
-
-               inst = tmpl->alloc(param->tb);
-               if (IS_ERR(inst))
-                       err = PTR_ERR(inst);
-               else if ((err = crypto_register_instance(tmpl, inst)))
-                       tmpl->free(inst);
+               err = tmpl->create(tmpl, param->tb);
        } while (err == -EAGAIN && !signal_pending(current));
 
        crypto_tmpl_put(tmpl);

diff --git a/crypto/shash.c b/crypto/shash.c
index e05e75b..70faf28 100644 (file)
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -427,11 +427,6 @@ static void crypto_shash_free_instance(struct crypto_instance *inst)
 {
        struct shash_instance *shash = shash_instance(inst);
 
-       if (!shash->free) {
-               inst->tmpl->free(inst);
-               return;
-       }
-
        shash->free(shash);
 }
 

diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index c16c50f..e115f92 100644 (file)
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -63,8 +63,6 @@ struct crypto_template {
        struct hlist_head instances;
        struct module *module;
 
-       struct crypto_instance *(*alloc)(struct rtattr **tb);
-       void (*free)(struct crypto_instance *inst);
        int (*create)(struct crypto_template *tmpl, struct rtattr **tb);
 
        char name[CRYPTO_MAX_ALG_NAME];