crypto: algapi - remove crypto_alloc_instance()

Now that all "blkcipher" templates have been converted to "skcipher",
crypto_alloc_instance() is no longer used.  And it's not useful any
longer as it creates an old-style weakly typed instance rather than a
new-style strongly typed instance.  So remove it, and now that the name
is freed up rename crypto_alloc_instance2() to crypto_alloc_instance().

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

diff --git a/crypto/algapi.c b/crypto/algapi.c
index 8b65ada33e5d33a5ede556201b85ec2c6448a53c..f3d766312bd96a88bd84bf27b2529f7761b6df65 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -845,8 +845,8 @@ int crypto_inst_setname(struct crypto_instance *inst, const char *name,
 }
 EXPORT_SYMBOL_GPL(crypto_inst_setname);
 
-void *crypto_alloc_instance2(const char *name, struct crypto_alg *alg,
-                            unsigned int head)
+void *crypto_alloc_instance(const char *name, struct crypto_alg *alg,
+                           unsigned int head)
 {
        struct crypto_instance *inst;
        char *p;
@@ -869,35 +869,6 @@ err_free_inst:
        kfree(p);
        return ERR_PTR(err);
 }
-EXPORT_SYMBOL_GPL(crypto_alloc_instance2);
-
-struct crypto_instance *crypto_alloc_instance(const char *name,
-                                             struct crypto_alg *alg)
-{
-       struct crypto_instance *inst;
-       struct crypto_spawn *spawn;
-       int err;
-
-       inst = crypto_alloc_instance2(name, alg, 0);
-       if (IS_ERR(inst))
-               goto out;
-
-       spawn = crypto_instance_ctx(inst);
-       err = crypto_init_spawn(spawn, alg, inst,
-                               CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);
-
-       if (err)
-               goto err_free_inst;
-
-       return inst;
-
-err_free_inst:
-       kfree(inst);
-       inst = ERR_PTR(err);
-
-out:
-       return inst;
-}
 EXPORT_SYMBOL_GPL(crypto_alloc_instance);
 
 void crypto_init_queue(struct crypto_queue *queue, unsigned int max_qlen)

diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 4a5ad10e75f0e714f874996dfc9be8879b08a54d..093869f175d6bf4e943ab711aa9c69ad5c68be53 100644 (file)
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -185,10 +185,8 @@ static inline struct crypto_alg *crypto_attr_alg(struct rtattr *rta,
 int crypto_attr_u32(struct rtattr *rta, u32 *num);
 int crypto_inst_setname(struct crypto_instance *inst, const char *name,
                        struct crypto_alg *alg);
-void *crypto_alloc_instance2(const char *name, struct crypto_alg *alg,
-                            unsigned int head);
-struct crypto_instance *crypto_alloc_instance(const char *name,
-                                             struct crypto_alg *alg);
+void *crypto_alloc_instance(const char *name, struct crypto_alg *alg,
+                           unsigned int head);
 
 void crypto_init_queue(struct crypto_queue *queue, unsigned int max_qlen);
 int crypto_enqueue_request(struct crypto_queue *queue,

diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h
index a0b0ad9d585e6a7b392887ebc9d602349af9ec88..e355fdb642a929be1244d3040ab64e000f149ec1 100644 (file)
--- a/include/crypto/internal/hash.h
+++ b/include/crypto/internal/hash.h
@@ -170,7 +170,7 @@ static inline unsigned int ahash_instance_headroom(void)
 static inline struct ahash_instance *ahash_alloc_instance(
        const char *name, struct crypto_alg *alg)
 {
-       return crypto_alloc_instance2(name, alg, ahash_instance_headroom());
+       return crypto_alloc_instance(name, alg, ahash_instance_headroom());
 }
 
 static inline void ahash_request_complete(struct ahash_request *req, int err)
@@ -233,8 +233,8 @@ static inline void *shash_instance_ctx(struct shash_instance *inst)
 static inline struct shash_instance *shash_alloc_instance(
        const char *name, struct crypto_alg *alg)
 {
-       return crypto_alloc_instance2(name, alg,
-                                     sizeof(struct shash_alg) - sizeof(*alg));
+       return crypto_alloc_instance(name, alg,
+                                    sizeof(struct shash_alg) - sizeof(*alg));
 }
 
 static inline struct crypto_shash *crypto_spawn_shash(