From patchwork Tue May 8 11:28:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Westin X-Patchwork-Id: 8465 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 14FF223E13 for ; Tue, 8 May 2012 11:29:24 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id B3C3BA18356 for ; Tue, 8 May 2012 11:29:23 +0000 (UTC) Received: by yenq6 with SMTP id q6so266402yen.11 for ; Tue, 08 May 2012 04:29:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:x-gm-message-state; bh=eqpuZLKF3KmO9u6b6kLQJJco8d2D/fSdrHP7gJcPqes=; b=JvnzWSVekr8/pVVY6GE0f5IJzQo9sbdgwjRRK+lG5zJ1+pAC9suweBpLATu3SBaZeB uYUt0ItXont+eU+UptOrxu/ycUoS5IBQJBwkQscktlcLhJUjrUBGjKFHggAwrhL7VO0R 3kZ0NZ5bNkAAyRvDrKzHAeYOeYzuPVY47RJdUWG7IoyKaft277BQ0rB9yxJjB0sOmJ29 VB5+Gntjv8aVzdiB6/LLwDFJ/u7qSqEMsNx+taum0rlAw1AQ8SMIudNe6H0PhfLo+K0c c4sPOx8t3cOAyget1Crh+kX95tdMvki0uNATE4EUQX9V8YlbmNrLA3+610ZhjQ4cn/h8 CWig== Received: by 10.42.139.9 with SMTP id e9mr4917868icu.43.1336476562859; Tue, 08 May 2012 04:29:22 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.73.147 with SMTP id q19csp192517ibj; Tue, 8 May 2012 04:29:21 -0700 (PDT) Received: by 10.14.133.81 with SMTP id p57mr764049eei.22.1336476560516; Tue, 08 May 2012 04:29:20 -0700 (PDT) Received: from eu1sys200aog120.obsmtp.com (eu1sys200aog120.obsmtp.com. [207.126.144.149]) by mx.google.com with SMTP id s3si1423394eef.16.2012.05.08.04.29.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 May 2012 04:29:20 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.149 is neither permitted nor denied by best guess record for domain of andreas.westin@stericsson.com) client-ip=207.126.144.149; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.149 is neither permitted nor denied by best guess record for domain of andreas.westin@stericsson.com) smtp.mail=andreas.westin@stericsson.com Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob120.postini.com ([207.126.147.11]) with SMTP ID DSNKT6kDg50LCnjkJzbnGiWmoOJv1rmJUwZH@postini.com; Tue, 08 May 2012 11:29:20 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 216FEC4; Tue, 8 May 2012 11:28:40 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 7F736275A; Tue, 8 May 2012 11:28:40 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 039AA24C310; Tue, 8 May 2012 13:28:34 +0200 (CEST) Received: from steludxu4049.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.83.0; Tue, 8 May 2012 13:28:40 +0200 From: Andreas Westin To: Herbert Xu , "David S. Miller" Cc: , , , , Andreas Westin Subject: [PATCH 2/2] crypto: ux500: Update DMA handling for 3.4 Date: Tue, 8 May 2012 13:28:33 +0200 Message-ID: <1336476513-17145-3-git-send-email-andreas.westin@stericsson.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1336476513-17145-1-git-send-email-andreas.westin@stericsson.com> References: <1336476513-17145-1-git-send-email-andreas.westin@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQlvAmfZ5GQXDU7WfVjH7eJHtduuqggIhnyo/Ku37qCkzeOARCGJJVDkig52cIZSWCwIj6jr An update to the DMA framework added a new parameter to the device_prep_slave_sg call. Acked-by: Linus Walleij Signed-off-by: Andreas Westin --- drivers/crypto/ux500/cryp/cryp_core.c | 5 ++--- drivers/crypto/ux500/hash/hash_core.c | 2 +- 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 7051e00..7cac127 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 cc6a371..77f7508 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__);