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

crypto: skcipher - fold skcipher_walk_skcipher() into skcipher_walk_virt() 



Fold skcipher_walk_skcipher() into skcipher_walk_virt() which is its
only remaining caller.  No change in behavior.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 24300d28

crypto/skcipher.c

+8 −15
Original line number Diff line number Diff line
@@ -306,11 +306,14 @@ static int skcipher_walk_first(struct skcipher_walk *walk) 
	return skcipher_walk_next(walk);

}



static int skcipher_walk_skcipher(struct skcipher_walk *walk,

				  struct skcipher_request *req)

int skcipher_walk_virt(struct skcipher_walk *walk,

		       struct skcipher_request *req, bool atomic)

{

	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);

	struct skcipher_alg *alg = crypto_skcipher_alg(tfm);

	int err = 0;



	might_sleep_if(req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP);



	walk->total = req->cryptlen;

	walk->nbytes = 0;
@@ -318,7 +321,7 @@ static int skcipher_walk_skcipher(struct skcipher_walk *walk, 
	walk->oiv = req->iv;



	if (unlikely(!walk->total))

		return 0;

		goto out;



	scatterwalk_start(&walk->in, req->src);

	scatterwalk_start(&walk->out, req->dst);
@@ -336,18 +339,8 @@ static int skcipher_walk_skcipher(struct skcipher_walk *walk, 
	else

		walk->stride = alg->walksize;



	return skcipher_walk_first(walk);

}



int skcipher_walk_virt(struct skcipher_walk *walk,

		       struct skcipher_request *req, bool atomic)

{

	int err;



	might_sleep_if(req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP);



	err = skcipher_walk_skcipher(walk, req);



	err = skcipher_walk_first(walk);

out:

	walk->flags &= atomic ? ~SKCIPHER_WALK_SLEEP : ~0;



	return err;