crypto: ux500: use dmaengine_prep_slave_sg API

Use dmaengine_prep_slave_sg inline function instead of going through the
structures manually.

Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c
index 8e9dc05705a9b35985bda48c42c5fb6db61b0571..19a3a60706fc1c9fbf1e2cf5799d0d6e661f3c1f 100644 (file)
--- a/drivers/crypto/ux500/cryp/cryp_core.c
+++ b/drivers/crypto/ux500/cryp/cryp_core.c
@@ -553,10 +553,10 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx,
                dev_dbg(ctx->device->dev, "[%s]: Setting up DMA for buffer "
                        "(TO_DEVICE)", __func__);
 
-               desc = channel->device->device_prep_slave_sg(channel,
-                                            ctx->device->dma.sg_src,
-                                            ctx->device->dma.sg_src_len,
-                                            direction, DMA_CTRL_ACK, NULL);
+               desc = dmaengine_prep_slave_sg(channel,
+                               ctx->device->dma.sg_src,
+                               ctx->device->dma.sg_src_len,
+                               direction, DMA_CTRL_ACK);
                break;
 
        case DMA_FROM_DEVICE:
@@ -577,12 +577,12 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx,
                dev_dbg(ctx->device->dev, "[%s]: Setting up DMA for buffer "
                        "(FROM_DEVICE)", __func__);
 
-               desc = channel->device->device_prep_slave_sg(channel,
-                                            ctx->device->dma.sg_dst,
-                                            ctx->device->dma.sg_dst_len,
-                                            direction,
-                                            DMA_CTRL_ACK |
-                                            DMA_PREP_INTERRUPT, NULL);
+               desc = dmaengine_prep_slave_sg(channel,
+                               ctx->device->dma.sg_dst,
+                               ctx->device->dma.sg_dst_len,
+                               direction,
+                               DMA_CTRL_ACK |
+                               DMA_PREP_INTERRUPT);
 
                desc->callback = cryp_dma_out_callback;
                desc->callback_param = ctx;

diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
index 58d6fcfe2d0fd27e1134e314d04a71300fff9b59..ba2ed2110664f2ca8e5b8973643af95c880fb675 100644 (file)
--- a/drivers/crypto/ux500/hash/hash_core.c
+++ b/drivers/crypto/ux500/hash/hash_core.c
@@ -180,9 +180,9 @@ static int hash_set_dma_transfer(struct hash_ctx *ctx, struct scatterlist *sg,
 
        dev_dbg(ctx->device->dev, "[%s]: Setting up DMA for buffer "
                        "(TO_DEVICE)", __func__);
-       desc = channel->device->device_prep_slave_sg(channel,
+       desc = dmaengine_prep_slave_sg(channel,
                        ctx->device->dma.sg, ctx->device->dma.sg_len,
-                       direction, DMA_CTRL_ACK | DMA_PREP_INTERRUPT, NULL);
+                       direction, DMA_CTRL_ACK | DMA_PREP_INTERRUPT);
        if (!desc) {
                dev_err(ctx->device->dev,
                        "[%s]: device_prep_slave_sg() failed!", __func__);