[PATCH 07/22] crypto: shash, caam: Make use of the new sg_map helper function

[Logan Gunthorpe]

Very straightforward conversion to the new function in two crypto
drivers.

Signed-off-by: Logan Gunthorpe <log...@deltatee.com>
---
 crypto/shash.c                | 9 ++++++---
 drivers/crypto/caam/caamalg.c | 8 +++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/crypto/shash.c b/crypto/shash.c
index 5e31c8d..2b7de94 100644
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -283,10 +283,13 @@ int shash_ahash_digest(struct ahash_request *req, struct 
shash_desc *desc)
        if (nbytes < min(sg->length, ((unsigned int)(PAGE_SIZE)) - offset)) {
                void *data;
 
-               data = kmap_atomic(sg_page(sg));
-               err = crypto_shash_digest(desc, data + offset, nbytes,
+               data = sg_map(sg, SG_KMAP_ATOMIC);
+               if (IS_ERR(data))
+                       return PTR_ERR(data);
+
+               err = crypto_shash_digest(desc, data, nbytes,
                                          req->result);
-               kunmap_atomic(data);
+               sg_unmap(sg, data, SG_KMAP_ATOMIC);
                crypto_yield(desc->flags);
        } else
                err = crypto_shash_init(desc) ?:
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 9bc80eb..76b97de 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -89,7 +89,6 @@ static void dbg_dump_sg(const char *level, const char 
*prefix_str,
                        struct scatterlist *sg, size_t tlen, bool ascii)
 {
        struct scatterlist *it;
-       void *it_page;
        size_t len;
        void *buf;
 
@@ -98,19 +97,18 @@ static void dbg_dump_sg(const char *level, const char 
*prefix_str,
                 * make sure the scatterlist's page
                 * has a valid virtual memory mapping
                 */
-               it_page = kmap_atomic(sg_page(it));
-               if (unlikely(!it_page)) {
+               buf = sg_map(it, SG_KMAP_ATOMIC);
+               if (IS_ERR(buf)) {
                        printk(KERN_ERR "dbg_dump_sg: kmap failed\n");
                        return;
                }
 
-               buf = it_page + it->offset;
                len = min_t(size_t, tlen, it->length);
                print_hex_dump(level, prefix_str, prefix_type, rowsize,
                               groupsize, buf, len, ascii);
                tlen -= len;
 
-               kunmap_atomic(it_page);
+               sg_unmap(it, buf, SG_KMAP_ATOMIC);
        }
 }
 #endif
-- 
2.1.4