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:
  468577abe37ff7b453a9ac613e0ea155349203ae   reverted in
  b2ab4a57b018aafbba35bff088218f5cc3d2142e

Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

3 files changed, 5 insertions, 6 deletions

diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index 7bbc8b4ef2e9..db201bca1581 100644
--- a/crypto/ablkcipher.c
+++ b/crypto/ablkcipher.c
@@ -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;
diff --git a/crypto/ahash.c b/crypto/ahash.c
index dd2890608aeb..8acb886032ae 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -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);
 }
diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index 79ca2278c2a3..3bd749c7bb70 100644
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -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)))