From patchwork Wed Oct 17 08:11:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 1604321 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 7D4C2DF2AB for ; Wed, 17 Oct 2012 08:20:11 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TOOjG-0004dx-Of; Wed, 17 Oct 2012 08:11:50 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TOOjB-0004cp-Dn for linux-arm-kernel@lists.infradead.org; Wed, 17 Oct 2012 08:11:48 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MC1007VQ2Q7FF80@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 17 Oct 2012 17:11:39 +0900 (KST) X-AuditID: cbfee61a-b7f976d000001eb9-9c-507e683b13e0 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 67.9A.07865.B386E705; Wed, 17 Oct 2012 17:11:39 +0900 (KST) Received: from DOKGENEKIM03 ([12.23.120.199]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MC100JK12RFBV60@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 17 Oct 2012 17:11:39 +0900 (KST) From: Kukjin Kim To: 'Arnd Bergmann' , arm@kernel.org References: <1349813638-4617-1-git-send-email-arnd@arndb.de> <1349813638-4617-9-git-send-email-arnd@arndb.de> In-reply-to: <1349813638-4617-9-git-send-email-arnd@arndb.de> Subject: RE: [PATCH v2 v2 v2 8/8] spi/s3c64xx: use correct dma_transfer_direction type Date: Wed, 17 Oct 2012 17:11:39 +0900 Message-id: <003a01cdac3f$08fe40d0$1afac270$%kim@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac2mWq3+S999Xs45RBasvicnMI8UgAF48AMA Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNLMWRmVeSWpSXmKPExsVy+t9jQV3rjLoAg0MvxCw2Pb7G6sDosXlJ fQBjFJdNSmpOZllqkb5dAlfG2rlvWQreCVacvzaHpYHxEV8XIyeHhICJxPNN/5kgbDGJC/fW s3UxcnEICUxnlOifPoMRwlnGJPHsahcLSBWbgIbE4ffP2EFsEQFjiXXvV4EVMQs8ZZTYs+0+ 0CgOoI58iel/4kFMTgFbiU+PIkHKhQUiJF6veM4IYrMIqEqsW/sEbDEvUMnDe2tYIGxBiR+T 74HZzAJaEut3HmeCsOUlNq95ywwyUkJAXeLRX10QU0TASOL13UiIChGJfS/eMU5gFJqFZNAs JINmIRk0C0nLAkaWVYyiqQXJBcVJ6bmGesWJucWleel6yfm5mxjBQfxMagfjygaLQ4wCHIxK PLwfZtcGCLEmlhVX5h5ilOBgVhLhVUqrCxDiTUmsrEotyo8vKs1JLT7EKM3BoiTO2+yREiAk kJ5YkpqdmlqQWgSTZeLglGpgVD7fvkRwwbvJjRcT2Nn9rRYu+V3ldfBUQuvrrbU6SZ/3R7yK nfzOJOfLVa3X+zkb/6eY3uFhb192eqGYmsIOR5vPU5z5VklMz8icuaJpd84rvj/T4mq+LMiM 2X3uN2/nhj+/df2PvWHQ2iqjERmUH2yhttme4fVHWX+9dj7v42r7HqqniLSzKbEUZyQaajEX FScCAGnCSp1eAgAA X-Spam-Note: CRM114 invocation failed X-Spam-Score: -7.3 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.33 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, 'Grant Likely' , 'Ben Dooks' , spi-devel-general@lists.sourceforge.net, 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: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Arnd Bergmann wrote: > > 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 Acked-by: Kukjin Kim BTW, don't we need following accordingly? Thanks. Best regards, Kgene. --- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. > 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; > }; > -- > 1.7.10 diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 1a81c90..a0bb55e 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -1067,11 +1067,11 @@ static int __devinit s3c64xx_spi_get_dmares( if (tx) { dma_data = &sdd->tx_dma; - dma_data->direction = DMA_TO_DEVICE; + dma_data->direction = DMA_MEM_TO_DEV; chan_str = "tx"; } else { dma_data = &sdd->rx_dma; - dma_data->direction = DMA_FROM_DEVICE; + dma_data->direction = DMA_DEV_TO_MEM; chan_str = "rx"; }