Merge tag 'backport/v3.14.24-ltsi-rc1/phy-rcar-gen2-usb-to-v3.15' into backport/v3...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / crypto / caam / sg_sw_sec4.h

diff --git a/drivers/crypto/caam/sg_sw_sec4.h b/drivers/crypto/caam/sg_sw_sec4.h
index b12ff85..ce28a56 100644 (file)
--- a/drivers/crypto/caam/sg_sw_sec4.h
+++ b/drivers/crypto/caam/sg_sw_sec4.h
@@ -116,57 +116,3 @@ static int dma_unmap_sg_chained(struct device *dev, struct scatterlist *sg,
        }
        return nents;
 }
-
-/* Map SG page in kernel virtual address space and copy */
-static inline void sg_map_copy(u8 *dest, struct scatterlist *sg,
-                              int len, int offset)
-{
-       u8 *mapped_addr;
-
-       /*
-        * Page here can be user-space pinned using get_user_pages
-        * Same must be kmapped before use and kunmapped subsequently
-        */
-       mapped_addr = kmap_atomic(sg_page(sg));
-       memcpy(dest, mapped_addr + offset, len);
-       kunmap_atomic(mapped_addr);
-}
-
-/* Copy from len bytes of sg to dest, starting from beginning */
-static inline void sg_copy(u8 *dest, struct scatterlist *sg, unsigned int len)
-{
-       struct scatterlist *current_sg = sg;
-       int cpy_index = 0, next_cpy_index = current_sg->length;
-
-       while (next_cpy_index < len) {
-               sg_map_copy(dest + cpy_index, current_sg, current_sg->length,
-                           current_sg->offset);
-               current_sg = scatterwalk_sg_next(current_sg);
-               cpy_index = next_cpy_index;
-               next_cpy_index += current_sg->length;
-       }
-       if (cpy_index < len)
-               sg_map_copy(dest + cpy_index, current_sg, len-cpy_index,
-                           current_sg->offset);
-}
-
-/* Copy sg data, from to_skip to end, to dest */
-static inline void sg_copy_part(u8 *dest, struct scatterlist *sg,
-                                     int to_skip, unsigned int end)
-{
-       struct scatterlist *current_sg = sg;
-       int sg_index, cpy_index, offset;
-
-       sg_index = current_sg->length;
-       while (sg_index <= to_skip) {
-               current_sg = scatterwalk_sg_next(current_sg);
-               sg_index += current_sg->length;
-       }
-       cpy_index = sg_index - to_skip;
-       offset = current_sg->offset + current_sg->length - cpy_index;
-       sg_map_copy(dest, current_sg, cpy_index, offset);
-       if (end - sg_index) {
-               current_sg = scatterwalk_sg_next(current_sg);
-               sg_copy(dest + cpy_index, current_sg, end - sg_index);
-       }
-}