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: 12005 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 8324F23E57 for ; Fri, 5 Oct 2012 14:55:55 +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 05498A1909A for ; Fri, 5 Oct 2012 14:55:54 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so3893159iej.11 for ; Fri, 05 Oct 2012 07:55:54 -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=XhQaQB7BeKKNbgiASflnj1EQOJ8xfHyVZpYKedaYYsbjRzp2qDv5u9LJnvn67j8G6j zK90f+2ve2GXpYqo/75XDWwxFwbCdS1ej8aYayMdq2QlLcdPbguKvoFFw6mwvaY4nbcd aRLzsB4otHHC+GrD55mHJK94cO81VPTYmh5gzuG5JUHcNcEFjodAlWLlRIvR6MIGKrrb J7gcjNbF7dkMy0Yb7TyzwJKwo8lfXSimqWJojt+/hPiN61TehGxiWQ2PFFSX6WuhRvTN nGAU54a6dD1odBTm2YJbIvQNv6EdGTvoH5z9RYxQiab0FEtJpRdGtZqEnRLUokQrvRVR hO8Q== Received: by 10.50.155.136 with SMTP id vw8mr1406692igb.28.1349448954721; Fri, 05 Oct 2012 07:55:54 -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.184.232 with SMTP id ex8csp130600igc; Fri, 5 Oct 2012 07:55:54 -0700 (PDT) Received: by 10.216.245.135 with SMTP id o7mr5203120wer.40.1349448952985; Fri, 05 Oct 2012 07:55:52 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.171]) by mx.google.com with ESMTPS id a8si3118805wix.3.2012.10.05.07.55.52 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 07:55:52 -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.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 Cc: linux-kernel@vger.kernel.org, arm@kernel.org, Arnd Bergmann , Ben Dooks , Kukjin Kim , Grant Likely , linux-samsung-soc@vger.kernel.org, spi-devel-general@lists.sourceforge.net 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-Gm-Message-State: ALoCoQl56BT7nnvcRh88PNFhRPToEBaDcUPD0VnXlQhDEz9AHCo3hotj7qqL1dyvwDByVEfSk7uL 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; };