summaryrefslogtreecommitdiff
path: root/drivers/crypto
diff options
context:
space:
mode:
authorAndreas Westin <andreas.westin@stericsson.com>2012-05-10 10:14:07 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2012-05-15 17:25:33 +1000
commitf7329e71626c977fee672710142eb34ed7d021c7 (patch)
treef9e654efd09d30ecadaf177d00d026cef8db4631 /drivers/crypto
parent585d188f8072aa3722d5c1ec1f0f2ea82e474778 (diff)
downloadlinux-3.10-f7329e71626c977fee672710142eb34ed7d021c7.tar.gz
linux-3.10-f7329e71626c977fee672710142eb34ed7d021c7.tar.bz2
linux-3.10-f7329e71626c977fee672710142eb34ed7d021c7.zip
crypto: ux500 - Update DMA handling for 3.4
An update to the DMA framework added a new parameter to the device_prep_slave_sg call. Signed-off-by: Andreas Westin <andreas.westin@stericsson.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/ux500/cryp/cryp_core.c5
-rw-r--r--drivers/crypto/ux500/hash/hash_core.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c
index 7051e000163..7cac12793a4 100644
--- a/drivers/crypto/ux500/cryp/cryp_core.c
+++ b/drivers/crypto/ux500/cryp/cryp_core.c
@@ -542,8 +542,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx,
desc = channel->device->device_prep_slave_sg(channel,
ctx->device->dma.sg_src,
ctx->device->dma.sg_src_len,
- direction,
- DMA_CTRL_ACK);
+ direction, DMA_CTRL_ACK, NULL);
break;
case DMA_FROM_DEVICE:
@@ -569,7 +568,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx,
ctx->device->dma.sg_dst_len,
direction,
DMA_CTRL_ACK |
- DMA_PREP_INTERRUPT);
+ DMA_PREP_INTERRUPT, NULL);
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 cc6a371a270..77f7508b609 100644
--- a/drivers/crypto/ux500/hash/hash_core.c
+++ b/drivers/crypto/ux500/hash/hash_core.c
@@ -174,7 +174,7 @@ static int hash_set_dma_transfer(struct hash_ctx *ctx, struct scatterlist *sg,
"(TO_DEVICE)", __func__);
desc = channel->device->device_prep_slave_sg(channel,
ctx->device->dma.sg, ctx->device->dma.sg_len,
- direction, DMA_CTRL_ACK | DMA_PREP_INTERRUPT);
+ direction, DMA_CTRL_ACK | DMA_PREP_INTERRUPT, NULL);
if (!desc) {
dev_err(ctx->device->dev,
"[%s]: device_prep_slave_sg() failed!", __func__);