iommu/rockchip: don't do power domain enable on probe

[firefly-linux-kernel-4.4.55.git] / include / crypto / scatterwalk.h

diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h
index 3744d2a642dfbdf8a13141f0e2491b372a1d7a55..35f99b68d037066b987a90ae24b6b6ba5bd00d09 100644 (file)
--- a/include/crypto/scatterwalk.h
+++ b/include/crypto/scatterwalk.h
@@ -25,38 +25,17 @@
 #include <linux/scatterlist.h>
 #include <linux/sched.h>
 
-static inline void crypto_yield(u32 flags)
-{
-       if (flags & CRYPTO_TFM_REQ_MAY_SLEEP)
-               cond_resched();
-}
-
-static inline void scatterwalk_sg_chain(struct scatterlist *sg1, int num,
-                                       struct scatterlist *sg2)
-{
-       sg_set_page(&sg1[num - 1], (void *)sg2, 0, 0);
-       sg1[num - 1].page_link &= ~0x02;
-}
-
-static inline struct scatterlist *scatterwalk_sg_next(struct scatterlist *sg)
-{
-       if (sg_is_last(sg))
-               return NULL;
-
-       return (++sg)->length ? sg : (void *)sg_page(sg);
-}
-
 static inline void scatterwalk_crypto_chain(struct scatterlist *head,
                                            struct scatterlist *sg,
                                            int chain, int num)
 {
        if (chain) {
                head->length += sg->length;
-               sg = scatterwalk_sg_next(sg);
+               sg = sg_next(sg);
        }
 
        if (sg)
-               scatterwalk_sg_chain(head, num, sg);
+               sg_chain(head, num, sg);
        else
                sg_mark_end(head);
 }
@@ -113,4 +92,10 @@ void scatterwalk_done(struct scatter_walk *walk, int out, int more);
 void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg,
                              unsigned int start, unsigned int nbytes, int out);
 
+int scatterwalk_bytes_sglen(struct scatterlist *sg, int num_bytes);
+
+struct scatterlist *scatterwalk_ffwd(struct scatterlist dst[2],
+                                    struct scatterlist *src,
+                                    unsigned int len);
+
 #endif  /* _CRYPTO_SCATTERWALK_H */