From patchwork Fri Oct 5 14:55:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1553581 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 26F063FCFC for ; Fri, 5 Oct 2012 14:58:56 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TK9K6-0003fV-CQ; Fri, 05 Oct 2012 14:56:18 +0000 Received: from moutng.kundenserver.de ([212.227.126.171]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TK9Ji-0003aa-Pg for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2012 14:55:58 +0000 Received: from klappe2.boeblingen.de.ibm.com (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0Me10b-1T3qPq46pB-00Pe9p; Fri, 05 Oct 2012 16:55:52 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 15/16] spi/s3c64xx: use correct dma_transfer_direction type Date: Fri, 5 Oct 2012 16:55:29 +0200 Message-Id: <1349448930-23976-16-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349448930-23976-1-git-send-email-arnd@arndb.de> References: <1349448930-23976-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:2aOWXV5bzlX+Eo0mw/vO1uC7Y4ZYB1Uk3pUZiH6CuBp QzUlpY4Hhe4tsTKcQXZs4PrE//E6ULRgP0VVmevGRPKHFTlURp WNqkH3DGaxYSyF+IjvkCM9lB5FFJl7X5rrBlnUxrGOvJf1dTnc F8PbsoScrlT+6W0gsaIigijEXht2cfsQUVG5vLXC9OlYG5/q6g uP1VTZffDaZh7g4rTdjF1jEHZxPj9BSnBAr5bdfjIW6cI+q8vq fLhmAbTAoTTB7Tr4/uR5F9BlMuHO19r7Skn2kOKRfvqFDGDvV6 AECIECUX9cjUPZPYFbbaRo3NgHgK5PIfoO3K20FXMCXYgkM4pU 3bIjrGmZtwW2+PHdjGR1WjDhBnquyX+rfO+bj6FWuw7ec56bR2 AaqPOd1/3JGRHjA6K8/orBELqvd9e4MxGI= X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.171 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Kukjin Kim , Arnd Bergmann , linux-kernel@vger.kernel.org, Grant Likely , linux-samsung-soc@vger.kernel.org, arm@kernel.org, Ben Dooks , spi-devel-general@lists.sourceforge.net 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 There is a subtle difference between dma_transfer_direction and dma_data_direction: the former is used by the dmaengine framework, while the latter is used by the dma-mapping API. Although the purpose is comparable, the actual values are different and must not be mixed. In this case, the driver just wants to use dma_transfer_direction. Without this patch, building s3c6400_defconfig results in: drivers/spi/spi-s3c64xx.c: In function 's3c64xx_spi_dmacb': drivers/spi/spi-s3c64xx.c:239:21: warning: comparison between 'enum dma_data_direction' and 'enum dma_transfer_direction' [-Wenum-compare] Signed-off-by: Arnd Bergmann Cc: Ben Dooks Cc: Kukjin Kim Cc: Grant Likely Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: spi-devel-general@lists.sourceforge.net --- drivers/spi/spi-s3c64xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index d1c8441f..2e44dd6 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -132,7 +132,7 @@ struct s3c64xx_spi_dma_data { unsigned ch; - enum dma_data_direction direction; + enum dma_transfer_direction direction; enum dma_ch dmach; struct property *dma_prop; };