Merge tag 'md/3.20-fixes' of git://neil.brown.name/md

[uclinux-h8/linux.git] / crypto / scatterwalk.c

diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index 79ca227..3bd749c 100644 (file)
--- 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)))