diff options
author | Fabio Baltieri <fabio.baltieri@linaro.org> | 2013-06-25 04:54:48 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-06-25 08:51:30 -0400 |
commit | 7e933d3b1e25b250b58b827ef455a1b489c84157 (patch) | |
tree | 6a5de5f5692c121a38c9bb53c2142ad5af6f445b /drivers | |
parent | 97453dfbbb5c26211998ed2639a45750ea5cc543 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/crypto/ux500/cryp/cryp_core.c | 20 | ||||
-rw-r--r-- | drivers/crypto/ux500/hash/hash_core.c | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c index 8e9dc05705a9..19a3a60706fc 100644 --- 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, | |||
553 | dev_dbg(ctx->device->dev, "[%s]: Setting up DMA for buffer " | 553 | dev_dbg(ctx->device->dev, "[%s]: Setting up DMA for buffer " |
554 | "(TO_DEVICE)", __func__); | 554 | "(TO_DEVICE)", __func__); |
555 | 555 | ||
556 | desc = channel->device->device_prep_slave_sg(channel, | 556 | desc = dmaengine_prep_slave_sg(channel, |
557 | ctx->device->dma.sg_src, | 557 | ctx->device->dma.sg_src, |
558 | ctx->device->dma.sg_src_len, | 558 | ctx->device->dma.sg_src_len, |
559 | direction, DMA_CTRL_ACK, NULL); | 559 | direction, DMA_CTRL_ACK); |
560 | break; | 560 | break; |
561 | 561 | ||
562 | case DMA_FROM_DEVICE: | 562 | case DMA_FROM_DEVICE: |
@@ -577,12 +577,12 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx, | |||
577 | dev_dbg(ctx->device->dev, "[%s]: Setting up DMA for buffer " | 577 | dev_dbg(ctx->device->dev, "[%s]: Setting up DMA for buffer " |
578 | "(FROM_DEVICE)", __func__); | 578 | "(FROM_DEVICE)", __func__); |
579 | 579 | ||
580 | desc = channel->device->device_prep_slave_sg(channel, | 580 | desc = dmaengine_prep_slave_sg(channel, |
581 | ctx->device->dma.sg_dst, | 581 | ctx->device->dma.sg_dst, |
582 | ctx->device->dma.sg_dst_len, | 582 | ctx->device->dma.sg_dst_len, |
583 | direction, | 583 | direction, |
584 | DMA_CTRL_ACK | | 584 | DMA_CTRL_ACK | |
585 | DMA_PREP_INTERRUPT, NULL); | 585 | DMA_PREP_INTERRUPT); |
586 | 586 | ||
587 | desc->callback = cryp_dma_out_callback; | 587 | desc->callback = cryp_dma_out_callback; |
588 | desc->callback_param = ctx; | 588 | desc->callback_param = ctx; |
diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c index 58d6fcfe2d0f..ba2ed2110664 100644 --- 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, | |||
180 | 180 | ||
181 | dev_dbg(ctx->device->dev, "[%s]: Setting up DMA for buffer " | 181 | dev_dbg(ctx->device->dev, "[%s]: Setting up DMA for buffer " |
182 | "(TO_DEVICE)", __func__); | 182 | "(TO_DEVICE)", __func__); |
183 | desc = channel->device->device_prep_slave_sg(channel, | 183 | desc = dmaengine_prep_slave_sg(channel, |
184 | ctx->device->dma.sg, ctx->device->dma.sg_len, | 184 | ctx->device->dma.sg, ctx->device->dma.sg_len, |
185 | direction, DMA_CTRL_ACK | DMA_PREP_INTERRUPT, NULL); | 185 | direction, DMA_CTRL_ACK | DMA_PREP_INTERRUPT); |
186 | if (!desc) { | 186 | if (!desc) { |
187 | dev_err(ctx->device->dev, | 187 | dev_err(ctx->device->dev, |
188 | "[%s]: device_prep_slave_sg() failed!", __func__); | 188 | "[%s]: device_prep_slave_sg() failed!", __func__); |