Commit 2ca33da1 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: api - Remove frontend argument from extsize/init_tfm 



As the extsize and init_tfm functions belong to the frontend the
frontend argument is superfluous.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6b1679f4

crypto/api.c

+2 −2
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ void *crypto_create_tfm(struct crypto_alg *alg, 
	int err = -ENOMEM;



	tfmsize = frontend->tfmsize;

	total = tfmsize + sizeof(*tfm) + frontend->extsize(alg, frontend);

	total = tfmsize + sizeof(*tfm) + frontend->extsize(alg);



	mem = kzalloc(total, GFP_KERNEL);

	if (mem == NULL)
@@ -466,7 +466,7 @@ void *crypto_create_tfm(struct crypto_alg *alg, 
	tfm = (struct crypto_tfm *)(mem + tfmsize);

	tfm->__crt_alg = alg;



	err = frontend->init_tfm(tfm, frontend);

	err = frontend->init_tfm(tfm);

	if (err)

		goto out_free_tfm;

crypto/pcompress.c

+2 −4
Original line number Diff line number Diff line
@@ -36,14 +36,12 @@ static int crypto_pcomp_init(struct crypto_tfm *tfm, u32 type, u32 mask) 
	return 0;

}



static unsigned int crypto_pcomp_extsize(struct crypto_alg *alg,

					 const struct crypto_type *frontend)

static unsigned int crypto_pcomp_extsize(struct crypto_alg *alg)

{

	return alg->cra_ctxsize;

}



static int crypto_pcomp_init_tfm(struct crypto_tfm *tfm,

				 const struct crypto_type *frontend)

static int crypto_pcomp_init_tfm(struct crypto_tfm *tfm)

{

	return 0;

}

crypto/shash.c

+2 −4
Original line number Diff line number Diff line
@@ -448,8 +448,7 @@ static unsigned int crypto_shash_ctxsize(struct crypto_alg *alg, u32 type, 
	return 0;

}



static int crypto_shash_init_tfm(struct crypto_tfm *tfm,

				 const struct crypto_type *frontend)

static int crypto_shash_init_tfm(struct crypto_tfm *tfm)

{

	struct crypto_shash *hash = __crypto_shash_cast(tfm);
@@ -457,8 +456,7 @@ static int crypto_shash_init_tfm(struct crypto_tfm *tfm, 
	return 0;

}



static unsigned int crypto_shash_extsize(struct crypto_alg *alg,

					 const struct crypto_type *frontend)

static unsigned int crypto_shash_extsize(struct crypto_alg *alg)

{

	return alg->cra_ctxsize;

}

include/crypto/algapi.h

+2 −4
Original line number Diff line number Diff line
@@ -22,11 +22,9 @@ struct seq_file; 


struct crypto_type {

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

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

				const struct crypto_type *frontend);

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

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

	int (*init_tfm)(struct crypto_tfm *tfm,

		        const struct crypto_type *frontend);

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

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

	struct crypto_alg *(*lookup)(const char *name, u32 type, u32 mask);