Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef45b834 authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by Herbert Xu
Browse files

crypto: aesni-intel - move more common code to ablk_init_common 



ablk_*_init functions share more common code than what is currently in
ablk_init_common. Move all of the common code to ablk_init_common.

Cc: Huang Ying <ying.huang@intel.com>
Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent fa46ccb8

arch/x86/crypto/aesni-intel_glue.c

+15 −55
Original line number Diff line number Diff line
@@ -442,61 +442,42 @@ static void ablk_exit(struct crypto_tfm *tfm) 
	cryptd_free_ablkcipher(ctx->cryptd_tfm);

}



static void ablk_init_common(struct crypto_tfm *tfm,

			     struct cryptd_ablkcipher *cryptd_tfm)

static int ablk_init_common(struct crypto_tfm *tfm, const char *drv_name)

{

	struct async_aes_ctx *ctx = crypto_tfm_ctx(tfm);

	struct cryptd_ablkcipher *cryptd_tfm;



	cryptd_tfm = cryptd_alloc_ablkcipher(drv_name, 0, 0);

	if (IS_ERR(cryptd_tfm))

		return PTR_ERR(cryptd_tfm);



	ctx->cryptd_tfm = cryptd_tfm;

	tfm->crt_ablkcipher.reqsize = sizeof(struct ablkcipher_request) +

		crypto_ablkcipher_reqsize(&cryptd_tfm->base);



	return 0;

}



static int ablk_ecb_init(struct crypto_tfm *tfm)

{

	struct cryptd_ablkcipher *cryptd_tfm;



	cryptd_tfm = cryptd_alloc_ablkcipher("__driver-ecb-aes-aesni", 0, 0);

	if (IS_ERR(cryptd_tfm))

		return PTR_ERR(cryptd_tfm);

	ablk_init_common(tfm, cryptd_tfm);

	return 0;

	return ablk_init_common(tfm, "__driver-ecb-aes-aesni");

}



static int ablk_cbc_init(struct crypto_tfm *tfm)

{

	struct cryptd_ablkcipher *cryptd_tfm;



	cryptd_tfm = cryptd_alloc_ablkcipher("__driver-cbc-aes-aesni", 0, 0);

	if (IS_ERR(cryptd_tfm))

		return PTR_ERR(cryptd_tfm);

	ablk_init_common(tfm, cryptd_tfm);

	return 0;

	return ablk_init_common(tfm, "__driver-cbc-aes-aesni");

}



#ifdef CONFIG_X86_64

static int ablk_ctr_init(struct crypto_tfm *tfm)

{

	struct cryptd_ablkcipher *cryptd_tfm;



	cryptd_tfm = cryptd_alloc_ablkcipher("__driver-ctr-aes-aesni", 0, 0);

	if (IS_ERR(cryptd_tfm))

		return PTR_ERR(cryptd_tfm);

	ablk_init_common(tfm, cryptd_tfm);

	return 0;

	return ablk_init_common(tfm, "__driver-ctr-aes-aesni");

}



#ifdef HAS_CTR

static int ablk_rfc3686_ctr_init(struct crypto_tfm *tfm)

{

	struct cryptd_ablkcipher *cryptd_tfm;



	cryptd_tfm = cryptd_alloc_ablkcipher(

		"rfc3686(__driver-ctr-aes-aesni)", 0, 0);

	if (IS_ERR(cryptd_tfm))

		return PTR_ERR(cryptd_tfm);

	ablk_init_common(tfm, cryptd_tfm);

	return 0;

	return ablk_init_common(tfm, "rfc3686(__driver-ctr-aes-aesni)");

}

#endif

#endif
@@ -504,42 +485,21 @@ static int ablk_rfc3686_ctr_init(struct crypto_tfm *tfm) 
#ifdef HAS_LRW

static int ablk_lrw_init(struct crypto_tfm *tfm)

{

	struct cryptd_ablkcipher *cryptd_tfm;



	cryptd_tfm = cryptd_alloc_ablkcipher("fpu(lrw(__driver-aes-aesni))",

					     0, 0);

	if (IS_ERR(cryptd_tfm))

		return PTR_ERR(cryptd_tfm);

	ablk_init_common(tfm, cryptd_tfm);

	return 0;

	return ablk_init_common(tfm, "fpu(lrw(__driver-aes-aesni))");

}

#endif



#ifdef HAS_PCBC

static int ablk_pcbc_init(struct crypto_tfm *tfm)

{

	struct cryptd_ablkcipher *cryptd_tfm;



	cryptd_tfm = cryptd_alloc_ablkcipher("fpu(pcbc(__driver-aes-aesni))",

					     0, 0);

	if (IS_ERR(cryptd_tfm))

		return PTR_ERR(cryptd_tfm);

	ablk_init_common(tfm, cryptd_tfm);

	return 0;

	return ablk_init_common(tfm, "fpu(pcbc(__driver-aes-aesni))");

}

#endif



#ifdef HAS_XTS

static int ablk_xts_init(struct crypto_tfm *tfm)

{

	struct cryptd_ablkcipher *cryptd_tfm;



	cryptd_tfm = cryptd_alloc_ablkcipher("fpu(xts(__driver-aes-aesni))",

					     0, 0);

	if (IS_ERR(cryptd_tfm))

		return PTR_ERR(cryptd_tfm);

	ablk_init_common(tfm, cryptd_tfm);

	return 0;

	return ablk_init_common(tfm, "fpu(xts(__driver-aes-aesni))");

}

#endif