From patchwork Tue Oct 9 20:13:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12086 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 109CD23F6D for ; Tue, 9 Oct 2012 20:14:45 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id B8BC7A18878 for ; Tue, 9 Oct 2012 20:14:44 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so12072696iej.11 for ; Tue, 09 Oct 2012 13:14:44 -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 :x-provags-id:x-gm-message-state; bh=cL9mUDSf1gRK2DVG7tKKpAEhDiHEjZikpvFnzZMpkWk=; b=h98YZx/os0d3eH9l/VDpuCZxUqal88NbLgEBxvmfRfrpyvRrmYePXSd1Dte62ExOpe uIVxsPMMb411Q0uxiEoS70ttkOiJXf7ehS/aDercpQa6HXLm7ZD6/JVVQrLNVKWrSXML j/jBcekKY3Zy4BkzV7RtBmerra/lhjAMbRJhzRIGwqqxXNJcsU3pdcLK1bKHXJhZ48KQ vBlk8yD5dOf5JDeiUJSnxVLImpTfMMqqM3qACGbiiZYfqckXSbwoBPCkIiLYGe0qFPOZ sPugsA5IRguAeXm0RcB4z05cYJXcJhKMjfDObmzDMQ2zTtR+51VbMhbzhM8LXVEBxi3x 5DjA== Received: by 10.42.57.10 with SMTP id b10mr12168985ich.54.1349813684492; Tue, 09 Oct 2012 13:14:44 -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.50.67.148 with SMTP id n20csp113953igt; Tue, 9 Oct 2012 13:14:43 -0700 (PDT) Received: by 10.180.76.11 with SMTP id g11mr6653901wiw.13.1349813682445; Tue, 09 Oct 2012 13:14:42 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.171]) by mx.google.com with ESMTPS id ba6si23752924wib.21.2012.10.09.13.14.42 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 09 Oct 2012 13:14:42 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.171 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.171; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.171 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from klappe2.lan (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0MQpfl-1SwlM33HTx-00U5sL; Tue, 09 Oct 2012 22:14:07 +0200 From: Arnd Bergmann To: arm@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Ben Dooks , Kukjin Kim , Grant Likely , linux-samsung-soc@vger.kernel.org, spi-devel-general@lists.sourceforge.net Subject: [PATCH v2 v2 v2 8/8] spi/s3c64xx: use correct dma_transfer_direction type Date: Tue, 9 Oct 2012 22:13:58 +0200 Message-Id: <1349813638-4617-9-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349813638-4617-1-git-send-email-arnd@arndb.de> References: <1349813638-4617-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:K1ol/Cd3KrrQPauNR/ShSFuQ4k5gbg5VAGtb6igR2Ms WOtKj95SoW/n2Loke5UpKjgvmSZf9vnFLdAmhbZDPPiJEgWZvt 25A65YEP/NkBha1zEnvSApRyMrTQZ6enqDmpf0nO/tGKD6VDkE OKTjCZLM753d4g9fkIUuGwGIORtB9cqMfOR4lM3wfG+/ne4UMV VWn66dF25pRj+1TtXJkGH78+TFeEumm1nC7Y4SXHdF31nBmjdU +TTTqnT56G77zaA5fCQjh6uCbPryKmE0pqOzvcK2i6BQa6UhYe Vrpfqr51XLalQ3BfekXqrTE1IRooetATO9ZPz5g/D2mEgNeMlX +8LGXXAcL2btFnb8kTVWhduRczMNoT7VEF/A0rR69 X-Gm-Message-State: ALoCoQn98oS+WG9YZVFRXsKUO0MD8yea59W17HGyhhOmw7EUaSeKfu/JZezG/XY7nVLoKyOZgFg5 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; };