From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755954Ab1JNH2v (ORCPT ); Fri, 14 Oct 2011 03:28:51 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:13142 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751326Ab1JNH2u (ORCPT ); Fri, 14 Oct 2011 03:28:50 -0400 X-AuditID: cbfee61a-b7cf1ae00000208e-00-4e97e4b0454f From: Kukjin Kim To: "'Vinod Koul'" , dan.j.williams@intel.com Cc: linux-kernel@vger.kernel.org, jaswinder.singh@linaro.org, 21cnbao@gmail.com, rmk@arm.linux.org.uk, "'Vinod Koul'" , "'Ben Dooks'" , "'Boojin Kim'" References: <1318570705-17595-1-git-send-email-vinod.koul@intel.com> <1318570705-17595-4-git-send-email-vinod.koul@intel.com> In-reply-to: <1318570705-17595-4-git-send-email-vinod.koul@intel.com> Subject: RE: [PATCH 03/10] plat-samsung: move to dma_transfer_direction Date: Fri, 14 Oct 2011 16:28:48 +0900 Message-id: <087001cc8a42$ea2ec4f0$be8c4ed0$%kim@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: AcyKNLn5zfT+jXamR7iEHBWe8tIyxAADLITw Content-language: ko X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Vinod Koul wrote: > > From: Vinod Koul > > Signed-off-by: Vinod Koul > Cc: Ben Dooks > Cc: Kukjin Kim Hi Vinod, If you want to take this in your tree, you can go ahead with ack from me. Acked-by: Kukjin Kim Thanks. Best regards, Kgene. -- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. > Cc: Boojin Kim > --- > arch/arm/plat-samsung/dma-ops.c | 4 ++-- > arch/arm/plat-samsung/include/plat/dma-ops.h | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c > index 6e3d9ab..a044171 100644 > --- a/arch/arm/plat-samsung/dma-ops.c > +++ b/arch/arm/plat-samsung/dma-ops.c > @@ -35,14 +35,14 @@ static unsigned samsung_dmadev_request(enum dma_ch > dma_ch, > > chan = dma_request_channel(mask, pl330_filter, (void *)dma_ch); > > - if (info->direction == DMA_FROM_DEVICE) { > + if (info->direction == DEV_TO_MEM) { > memset(&slave_config, 0, sizeof(struct dma_slave_config)); > slave_config.direction = info->direction; > slave_config.src_addr = info->fifo; > slave_config.src_addr_width = info->width; > slave_config.src_maxburst = 1; > dmaengine_slave_config(chan, &slave_config); > - } else if (info->direction == DMA_TO_DEVICE) { > + } else if (info->direction == MEM_TO_DEV) { > memset(&slave_config, 0, sizeof(struct dma_slave_config)); > slave_config.direction = info->direction; > slave_config.dst_addr = info->fifo; > diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat- > samsung/include/plat/dma-ops.h > index 4c1a363..1256115 100644 > --- a/arch/arm/plat-samsung/include/plat/dma-ops.h > +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h > @@ -17,7 +17,7 @@ > > struct samsung_dma_prep_info { > enum dma_transaction_type cap; > - enum dma_data_direction direction; > + enum dma_transfer_direction direction; > dma_addr_t buf; > unsigned long period; > unsigned long len; > @@ -27,7 +27,7 @@ struct samsung_dma_prep_info { > > struct samsung_dma_info { > enum dma_transaction_type cap; > - enum dma_data_direction direction; > + enum dma_transfer_direction direction; > enum dma_slave_buswidth width; > dma_addr_t fifo; > struct s3c2410_dma_client *client; > -- > 1.7.0.4