Commit a24a1fd7 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

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: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent a39c66cc

crypto/aead.c

+0 −5
Original line number Diff line number Diff line
@@ -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);

}

crypto/ahash.c

+0 −5
Original line number Diff line number Diff line
@@ -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);

}

crypto/algapi.c

+0 −5
Original line number Diff line number Diff line
@@ -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);

}

crypto/algboss.c

+1 −11
Original line number Diff line number Diff line
@@ -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);

	} while (err == -EAGAIN && !signal_pending(current));



	crypto_tmpl_put(tmpl);

crypto/shash.c

+0 −5
Original line number Diff line number Diff line
@@ -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);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE