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

Commit 5be4d4c9 authored by Cristian Stoica's avatar Cristian Stoica Committed by Herbert Xu
Browse files

crypto: replace scatterwalk_sg_next with sg_next 



Modify crypto drivers to use the generic SG helper since
both of them are equivalent and the one from crypto is redundant.

See also:
  468577ab   reverted in
  b2ab4a57

Signed-off-by: default avatarCristian Stoica <cristian.stoica@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 088f628c

crypto/ablkcipher.c

+1 −2
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ static inline unsigned int ablkcipher_done_slow(struct ablkcipher_walk *walk, 
		if (n == len_this_page)

			break;

		n -= len_this_page;

		scatterwalk_start(&walk->out, scatterwalk_sg_next(

			walk->out.sg));

		scatterwalk_start(&walk->out, sg_next(walk->out.sg));

	}



	return bsize;

crypto/ahash.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err) 
	if (!walk->total)

		return 0;



	walk->sg = scatterwalk_sg_next(walk->sg);

	walk->sg = sg_next(walk->sg);



	return hash_walk_new_entry(walk);

}

crypto/scatterwalk.c

+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out, 
		walk->offset += PAGE_SIZE - 1;

		walk->offset &= PAGE_MASK;

		if (walk->offset >= walk->sg->offset + walk->sg->length)

			scatterwalk_start(walk, scatterwalk_sg_next(walk->sg));

			scatterwalk_start(walk, sg_next(walk->sg));

	}

}
@@ -116,7 +116,7 @@ void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg, 
			break;



		offset += sg->length;

		sg = scatterwalk_sg_next(sg);

		sg = sg_next(sg);

	}



	scatterwalk_advance(&walk, start - offset);
@@ -136,7 +136,7 @@ int scatterwalk_bytes_sglen(struct scatterlist *sg, int num_bytes) 
	do {

		offset += sg->length;

		n++;

		sg = scatterwalk_sg_next(sg);

		sg = sg_next(sg);



		/* num_bytes is too large */

		if (unlikely(!sg && (num_bytes < offset)))

drivers/crypto/bfin_crc.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static int sg_count(struct scatterlist *sg_list) 


	while (!sg_is_last(sg)) {

		sg_nents++;

		sg = scatterwalk_sg_next(sg);

		sg = sg_next(sg);

	}



	return sg_nents;

drivers/crypto/caam/sg_sw_sec4.h

+4 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ sg_to_sec4_sg(struct scatterlist *sg, int sg_count, 
		dma_to_sec4_sg_one(sec4_sg_ptr, sg_dma_address(sg),

				   sg_dma_len(sg), offset);

		sec4_sg_ptr++;

		sg = scatterwalk_sg_next(sg);

		sg = sg_next(sg);

		sg_count--;

	}

	return sec4_sg_ptr - 1;
@@ -67,7 +67,7 @@ static inline int __sg_count(struct scatterlist *sg_list, int nbytes, 
		nbytes -= sg->length;

		if (!sg_is_last(sg) && (sg + 1)->length == 0)

			*chained = true;

		sg = scatterwalk_sg_next(sg);

		sg = sg_next(sg);

	}



	return sg_nents;
@@ -93,7 +93,7 @@ static int dma_map_sg_chained(struct device *dev, struct scatterlist *sg, 
		int i;

		for (i = 0; i < nents; i++) {

			dma_map_sg(dev, sg, 1, dir);

			sg = scatterwalk_sg_next(sg);

			sg = sg_next(sg);

		}

	} else {

		dma_map_sg(dev, sg, nents, dir);
@@ -109,7 +109,7 @@ static int dma_unmap_sg_chained(struct device *dev, struct scatterlist *sg, 
		int i;

		for (i = 0; i < nents; i++) {

			dma_unmap_sg(dev, sg, 1, dir);

			sg = scatterwalk_sg_next(sg);

			sg = sg_next(sg);

		}

	} else {

		dma_unmap_sg(dev, sg, nents, dir);