Commit fa919f9e authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Herbert Xu
Browse files

crypto: api - Remove crypto_init_ops() 



Purge crypto_type::init() as well.
The last user seems to be gone with commit d63007eb ("crypto:
ablkcipher - remove deprecated and unused ablkcipher support").

Signed-off-by: default avatarDmitry Safonov <dima@arista.com>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6637e11e

crypto/api.c

+0 −14
Original line number Diff line number Diff line
@@ -345,15 +345,6 @@ struct crypto_alg *crypto_alg_mod_lookup(const char *name, u32 type, u32 mask) 
}

EXPORT_SYMBOL_GPL(crypto_alg_mod_lookup);



static int crypto_init_ops(struct crypto_tfm *tfm, u32 type, u32 mask)

{

	const struct crypto_type *type_obj = tfm->__crt_alg->cra_type;



	if (type_obj)

		return type_obj->init(tfm, type, mask);

	return 0;

}



static void crypto_exit_ops(struct crypto_tfm *tfm)

{

	const struct crypto_type *type = tfm->__crt_alg->cra_type;
@@ -410,10 +401,6 @@ struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type, 
	tfm->__crt_alg = alg;

	refcount_set(&tfm->refcnt, 1);



	err = crypto_init_ops(tfm, type, mask);

	if (err)

		goto out_free_tfm;



	if (!tfm->exit && alg->cra_init && (err = alg->cra_init(tfm)))

		goto cra_init_failed;
@@ -421,7 +408,6 @@ struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type, 


cra_init_failed:

	crypto_exit_ops(tfm);

out_free_tfm:

	if (err == -EAGAIN)

		crypto_shoot_alg(alg);

	kfree(tfm);

include/crypto/algapi.h

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ struct sk_buff; 
struct crypto_type {

	unsigned int (*ctxsize)(struct crypto_alg *alg, u32 type, u32 mask);

	unsigned int (*extsize)(struct crypto_alg *alg);

	int (*init)(struct crypto_tfm *tfm, u32 type, u32 mask);

	int (*init_tfm)(struct crypto_tfm *tfm);

	void (*show)(struct seq_file *m, struct crypto_alg *alg);

	int (*report)(struct sk_buff *skb, struct crypto_alg *alg);