Commit 13bba5b5 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: aspeed - Remove prepare/unprepare request 



The callbacks for prepare and unprepare request in crypto_engine
is superfluous.  They can be done directly from do_one_request.

Move the code into do_one_request and remove the unused callbacks.

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

drivers/crypto/aspeed/aspeed-acry.c

+0 −2
Original line number Diff line number Diff line
@@ -590,8 +590,6 @@ static int aspeed_acry_rsa_init_tfm(struct crypto_akcipher *tfm) 
	}



	ctx->enginectx.op.do_one_request = aspeed_acry_do_request;

	ctx->enginectx.op.prepare_request = NULL;

	ctx->enginectx.op.unprepare_request = NULL;



	return 0;

}

drivers/crypto/aspeed/aspeed-hace-crypto.c

+0 −2
Original line number Diff line number Diff line
@@ -714,8 +714,6 @@ static int aspeed_crypto_cra_init(struct crypto_skcipher *tfm) 
			 crypto_skcipher_reqsize(ctx->fallback_tfm));



	ctx->enginectx.op.do_one_request = aspeed_crypto_do_request;

	ctx->enginectx.op.prepare_request = NULL;

	ctx->enginectx.op.unprepare_request = NULL;



	return 0;

}

drivers/crypto/aspeed/aspeed-hace-hash.c

+8 −6
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ static int aspeed_ahash_do_request(struct crypto_engine *engine, void *areq) 
	return 0;

}



static int aspeed_ahash_prepare_request(struct crypto_engine *engine,

static void aspeed_ahash_prepare_request(struct crypto_engine *engine,

					 void *areq)

{

	struct ahash_request *req = ahash_request_cast(areq);
@@ -581,8 +581,12 @@ static int aspeed_ahash_prepare_request(struct crypto_engine *engine, 
		hash_engine->dma_prepare = aspeed_ahash_dma_prepare_sg;

	else

		hash_engine->dma_prepare = aspeed_ahash_dma_prepare;

}



	return 0;

static int aspeed_ahash_do_one(struct crypto_engine *engine, void *areq)

{

	aspeed_ahash_prepare_request(engine, areq);

	return aspeed_ahash_do_request(engine, areq);

}



static int aspeed_sham_update(struct ahash_request *req)
@@ -876,9 +880,7 @@ static int aspeed_sham_cra_init(struct crypto_tfm *tfm) 
		}

	}



	tctx->enginectx.op.do_one_request = aspeed_ahash_do_request;

	tctx->enginectx.op.prepare_request = aspeed_ahash_prepare_request;

	tctx->enginectx.op.unprepare_request = NULL;

	tctx->enginectx.op.do_one_request = aspeed_ahash_do_one;



	return 0;

}