summaryrefslogtreecommitdiffstats
path: root/include/crypto
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2015-08-07 12:15:13 -0400
committerJens Axboe <axboe@fb.com>2015-08-17 10:12:54 -0400
commitc56f6d1270b9fc31144b59106bc8590c2acf4a8e (patch)
treeaed4bd399c4b10300da7283e935688d7374e1c3d /include/crypto
parent02c4de53add1b799f5663d5e9c8e9a5d9366a507 (diff)
crypto: replace scatterwalk_sg_chain with sg_chain
Signed-off-by: Dan Williams <dan.j.williams@intel.com> [hch: split from a larger patch by Dan] Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include/crypto')
-rw-r--r--include/crypto/scatterwalk.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h
index 96670e7e7c14..35f99b68d037 100644
--- a/include/crypto/scatterwalk.h
+++ b/include/crypto/scatterwalk.h
@@ -25,14 +25,6 @@
25#include <linux/scatterlist.h> 25#include <linux/scatterlist.h>
26#include <linux/sched.h> 26#include <linux/sched.h>
27 27
28static inline void scatterwalk_sg_chain(struct scatterlist *sg1, int num,
29 struct scatterlist *sg2)
30{
31 sg_set_page(&sg1[num - 1], (void *)sg2, 0, 0);
32 sg1[num - 1].page_link &= ~0x02;
33 sg1[num - 1].page_link |= 0x01;
34}
35
36static inline void scatterwalk_crypto_chain(struct scatterlist *head, 28static inline void scatterwalk_crypto_chain(struct scatterlist *head,
37 struct scatterlist *sg, 29 struct scatterlist *sg,
38 int chain, int num) 30 int chain, int num)
@@ -43,7 +35,7 @@ static inline void scatterwalk_crypto_chain(struct scatterlist *head,
43 } 35 }
44 36
45 if (sg) 37 if (sg)
46 scatterwalk_sg_chain(head, num, sg); 38 sg_chain(head, num, sg);
47 else 39 else
48 sg_mark_end(head); 40 sg_mark_end(head);
49} 41}