Commit 4136212a authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: sun8i-ce - 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 cdb8b7e1

drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c

+14 −6
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static int sun8i_ce_cipher_prepare(struct crypto_engine *engine, void *async_req 
	return err;

}



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

static void sun8i_ce_cipher_run(struct crypto_engine *engine, void *areq)

{

	struct skcipher_request *breq = container_of(areq, struct skcipher_request, base);

	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(breq);
@@ -308,10 +308,10 @@ static int sun8i_ce_cipher_run(struct crypto_engine *engine, void *areq) 
	local_bh_disable();

	crypto_finalize_skcipher_request(engine, breq, err);

	local_bh_enable();

	return 0;

}



static int sun8i_ce_cipher_unprepare(struct crypto_engine *engine, void *async_req)

static void sun8i_ce_cipher_unprepare(struct crypto_engine *engine,

				      void *async_req)

{

	struct skcipher_request *areq = container_of(async_req, struct skcipher_request, base);

	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(areq);
@@ -353,7 +353,17 @@ static int sun8i_ce_cipher_unprepare(struct crypto_engine *engine, void *async_r 
	}



	dma_unmap_single(ce->dev, rctx->addr_key, op->keylen, DMA_TO_DEVICE);

}



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

{

	int err = sun8i_ce_cipher_prepare(engine, areq);



	if (err)

		return err;



	sun8i_ce_cipher_run(engine, areq);

	sun8i_ce_cipher_unprepare(engine, areq);

	return 0;

}
@@ -423,9 +433,7 @@ int sun8i_ce_cipher_init(struct crypto_tfm *tfm) 
	       crypto_tfm_alg_driver_name(crypto_skcipher_tfm(op->fallback_tfm)),

	       CRYPTO_MAX_ALG_NAME);



	op->enginectx.op.do_one_request = sun8i_ce_cipher_run;

	op->enginectx.op.prepare_request = sun8i_ce_cipher_prepare;

	op->enginectx.op.unprepare_request = sun8i_ce_cipher_unprepare;

	op->enginectx.op.do_one_request = sun8i_ce_cipher_do_one;



	err = pm_runtime_get_sync(op->ce->dev);

	if (err < 0)

drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ int sun8i_ce_hash_crainit(struct crypto_tfm *tfm) 
	op->ce = algt->ce;



	op->enginectx.op.do_one_request = sun8i_ce_hash_run;

	op->enginectx.op.prepare_request = NULL;

	op->enginectx.op.unprepare_request = NULL;



	/* FALLBACK */

	op->fallback_tfm = crypto_alloc_ahash(crypto_tfm_alg_name(tfm), 0,