From patchwork Tue Aug 14 13:49:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Genoud X-Patchwork-Id: 1319511 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 5719BDF215 for ; Tue, 14 Aug 2012 13:57:21 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T1HYQ-0001XK-Ea; Tue, 14 Aug 2012 13:53:06 +0000 Received: from mail-wg0-f49.google.com ([74.125.82.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T1HVz-0000aO-G4 for linux-arm-kernel@lists.infradead.org; Tue, 14 Aug 2012 13:50:36 +0000 Received: by wgbez12 with SMTP id ez12so257818wgb.18 for ; Tue, 14 Aug 2012 06:50:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=DRJ1j+nFmG5HmOiaJbf6M1ccAHeEQSkc+oSb5gta8Hs=; b=bFZyrqScuWhlHFOMFoZnvvMIpfIWJIBxIIqBqrVACi2oJxp4kkj3WNS13jOu3BonSd mjhH3Py2lSux/McOY4MF6BOFiSY1iyMY9gK0ZOwjQOB9GRF1gL/cqgSWgvNp+vQt5jF5 ECkLsO5w9X3dqskLrk2GU46Pw78kMRMprIgxZ2GSQo0snwlYOarhlmSwZz4p0dObOXaX d4f8NUvyufbQIDdVxLuKEZOVoUUnlpQpdQN1a8iKOmXHFjvvJKMybqdpZol9lq4hVfJd McPoNM1jy/zMtOZK9U41oaN6/uWw4CFbADueytxSTQJX6W8DDBxrH0LPAYfcpASR2jJd CoCw== Received: by 10.216.134.20 with SMTP id r20mr8886315wei.61.1344952234327; Tue, 14 Aug 2012 06:50:34 -0700 (PDT) Received: from localhost.localdomain (lyon.paratronic.fr. [213.41.177.106]) by mx.google.com with ESMTPS id eu4sm22509397wib.2.2012.08.14.06.50.33 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Aug 2012 06:50:33 -0700 (PDT) From: Richard Genoud To: Nicolas Ferre Subject: [PATCH 10/23] spi-atmel: update with dmaengine interface Date: Tue, 14 Aug 2012 15:49:24 +0200 Message-Id: <1344952177-18385-11-git-send-email-richard.genoud@gmail.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1344952177-18385-1-git-send-email-richard.genoud@gmail.com> References: <1344952177-18385-1-git-send-email-richard.genoud@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (richard.genoud[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Richard Genoud , Jean-Christophe PLAGNIOL-VILLARD , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org commit 185ecb5f4fd43911c35956d4cc7d94a1da30417f changed dmaengine interface. => we have to update spi-atmel accordingly Signed-off-by: Richard Genoud --- drivers/spi/spi-atmel.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 9456fca..48bf3bc 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -542,7 +542,8 @@ static int atmel_spi_next_xfer_dma(struct spi_master *master, &as->dma.sgrx, 1, DMA_FROM_DEVICE, - DMA_PREP_INTERRUPT | DMA_CTRL_ACK); + DMA_PREP_INTERRUPT | DMA_CTRL_ACK, + NULL); if (!rxdesc) goto err_dma; @@ -550,7 +551,8 @@ static int atmel_spi_next_xfer_dma(struct spi_master *master, &as->dma.sgtx, 1, DMA_TO_DEVICE, - DMA_PREP_INTERRUPT | DMA_CTRL_ACK); + DMA_PREP_INTERRUPT | DMA_CTRL_ACK, + NULL); if (!txdesc) goto err_dma;