crypto: skcipher - Use scatterwalk (un)map interface for dst and src buffers

[linux-2.6-block.git] / crypto / skcipher.c

diff --git a/crypto/skcipher.c b/crypto/skcipher.c
index 0ecab31cfe79bfd8acc54dae56986c768a308373..7bf4871fec8006ac09c686fc88413256312bf255 100644 (file)
--- a/crypto/skcipher.c
+++ b/crypto/skcipher.c
@@ -42,38 +42,24 @@ struct skcipher_walk_buffer {
 
 static int skcipher_walk_next(struct skcipher_walk *walk);
 
-static inline void skcipher_unmap(struct scatter_walk *walk, void *vaddr)
-{
-       if (PageHighMem(scatterwalk_page(walk)))
-               kunmap_atomic(vaddr);
-}
-
-static inline void *skcipher_map(struct scatter_walk *walk)
-{
-       struct page *page = scatterwalk_page(walk);
-
-       return (PageHighMem(page) ? kmap_atomic(page) : page_address(page)) +
-              offset_in_page(walk->offset);
-}
-
 static inline void skcipher_map_src(struct skcipher_walk *walk)
 {
-       walk->src.virt.addr = skcipher_map(&walk->in);
+       walk->src.virt.addr = scatterwalk_map(&walk->in);
 }
 
 static inline void skcipher_map_dst(struct skcipher_walk *walk)
 {
-       walk->dst.virt.addr = skcipher_map(&walk->out);
+       walk->dst.virt.addr = scatterwalk_map(&walk->out);
 }
 
 static inline void skcipher_unmap_src(struct skcipher_walk *walk)
 {
-       skcipher_unmap(&walk->in, walk->src.virt.addr);
+       scatterwalk_unmap(walk->src.virt.addr);
 }
 
 static inline void skcipher_unmap_dst(struct skcipher_walk *walk)
 {
-       skcipher_unmap(&walk->out, walk->dst.virt.addr);
+       scatterwalk_unmap(walk->dst.virt.addr);
 }
 
 static inline gfp_t skcipher_walk_gfp(struct skcipher_walk *walk)