From patchwork Thu Feb 14 03:47:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 2140291 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 25FCFDF283 for ; Thu, 14 Feb 2013 03:50:07 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5pnC-0000he-MP; Thu, 14 Feb 2013 03:47:26 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5pn9-0000gw-Bh for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2013 03:47:25 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MI6004OLYIKSQ70@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2013 12:47:20 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.124]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id C8.F1.03880.74E5C115; Thu, 14 Feb 2013 12:47:19 +0900 (KST) X-AuditID: cbfee61b-b7fb06d000000f28-22-511c5e472608 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id B7.F1.03880.74E5C115; Thu, 14 Feb 2013 12:47:19 +0900 (KST) Received: from padma-linuxpc.sisodomain.com ([107.108.83.35]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MI600NTOYIN4AN0@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2013 12:47:19 +0900 (KST) From: Padmavathi Venna To: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, padma.v@samsung.com, padma.kvr@gmail.com Subject: [PATCH] ARM: SAMSUNG: dma: Remove unnecessary code Date: Thu, 14 Feb 2013 09:17:46 +0530 Message-id: <1360813666-9651-1-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFLMWRmVeSWpSXmKPExsWyRsSkRtc9TibQ4MEGC4tNj6+xOjB6bF5S H8AYxWWTkpqTWZZapG+XwJXR0tnPUrBRouLS4gmMDYzzRLoYOTkkBEwkbu/fywhhi0lcuLee rYuRi0NIYCmjxLyDTxlhip5uOMQKkVjEKPG7dQpU1VYmic+TtgFlODjYBHQkWs66gDSICJRL 3H/4gBXEZhZYzyhx/SELiC0sYC3R/qAVLM4ioCox6ewZsAW8Ak4SHQubmSGWKUgcm/oVbJmE wA42iTcnVzJCNAhIfJt8iAVkl4SArMSmA1D1khIHV9xgmcAouICRYRWjaGpBckFxUnqukV5x Ym5xaV66XnJ+7iZGYEid/vdMegfjqgaLQ4wCHIxKPLwKv6QDhVgTy4orcw8xSnAwK4nwvgyU CRTiTUmsrEotyo8vKs1JLT7EmAy0fCKzlGhyPjDc80riDY1NzE2NTS2NjMxMTUkTVhLnZTz1 JEBIID2xJDU7NbUgtQhmCxMHp1QD48RnSdqPgupeBtyfV7N+qeZtttWvNON7slt6C/9Z97B+ ls+S0U6Z1ndWNjI1kD+3ft/NCpf55hn1b0Rcb5VGJ3rlml1wkdyte2PXSteOrgnxzkVeLR5/ 1VcWGMQHRDdk9DsyTpEwbTE395trqN8sM2slX7rBJIONzT3SNnZv4tgSE3ImTlRiKc5INNRi LipOBAAHduRFbQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeLIzCtJLcpLzFFi42I5/e+xgK57nEygwdK16habHl9jdWD02Lyk PoAxqoHRJiM1MSW1SCE1Lzk/JTMv3VbJOzjeOd7UzMBQ19DSwlxJIS8xN9VWycUnQNctMwdo qpJCWWJOKVAoILG4WEnfDtOE0BA3XQuYxghd35AguB4jAzSQsIYxo6Wzn6Vgo0TFpcUTGBsY 54l0MXJySAiYSDzdcIgVwhaTuHBvPVsXIxeHkMAiRonfrVOgnK1MEp8nbQOq4uBgE9CRaDnr AtIgIlAucf/hA7BmZoH1jBLXH7KA2MIC1hLtD1rB4iwCqhKTzp5hBLF5BZwkOhY2M0MsU5A4 NvUr6wRG7gWMDKsYRVMLkguKk9JzjfSKE3OLS/PS9ZLzczcxggP2mfQOxlUNFocYBTgYlXh4 FX5JBwqxJpYVV+YeYpTgYFYS4X0ZKBMoxJuSWFmVWpQfX1Sak1p8iDEZaPtEZinR5HxgNOWV xBsam5ibGptamliYmFmSJqwkzst46kmAkEB6YklqdmpqQWoRzBYmDk6pBsZptVb57jfKwjYv VU0t+GKcmCfQufCP9PWV6l+vhB/YF5N4R/Kt2fyZJ5RTlc6zzi+3P3w17PFM4/uJRzaVfdmj YsymI9BQpKPDWqdksNQ1487qSXzX/6w8b+LXZ/be4cOVE0Zfpj82X7ro4qvv54U6gw5bxK7p 8Jsn83rhhdt3I4UvvPH9tTBZiaU4I9FQi7moOBEAnV3wIJwCAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130213_224723_626092_66A0A6AC X-CRM114-Status: GOOD ( 11.32 ) X-Spam-Score: -7.5 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.5 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.7 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] 0.1 HDRS_LCASE Odd capitalization of message header Cc: kgene.kim@samsung.com, arnd@arndb.de, boojin.kim@samsung.com, sbkim73@samsung.com, broonie@opensource.wolfsonmicro.com, vinod.koul@intel.com, thomas.abraham@linaro.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: , 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 This patch removes the usage of DMACH_DT_PROP and dt_dmach_prop from dma code as the new generic dma dt binding support has been added. Signed-off-by: Padmavathi Venna Acked-by: Arnd Bergmann --- arch/arm/mach-s3c24xx/include/mach/dma.h | 1 - arch/arm/mach-s3c64xx/include/mach/dma.h | 1 - arch/arm/plat-samsung/dma-ops.c | 10 +--------- arch/arm/plat-samsung/include/plat/dma-ops.h | 1 - arch/arm/plat-samsung/include/plat/dma-pl330.h | 1 - 5 files changed, 1 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-s3c24xx/include/mach/dma.h b/arch/arm/mach-s3c24xx/include/mach/dma.h index 6b72d5a..b55da1d 100644 --- a/arch/arm/mach-s3c24xx/include/mach/dma.h +++ b/arch/arm/mach-s3c24xx/include/mach/dma.h @@ -24,7 +24,6 @@ */ enum dma_ch { - DMACH_DT_PROP = -1, /* not yet supported, do not use */ DMACH_XD0 = 0, DMACH_XD1, DMACH_SDI, diff --git a/arch/arm/mach-s3c64xx/include/mach/dma.h b/arch/arm/mach-s3c64xx/include/mach/dma.h index 57b1ff4..fe1a98c 100644 --- a/arch/arm/mach-s3c64xx/include/mach/dma.h +++ b/arch/arm/mach-s3c64xx/include/mach/dma.h @@ -21,7 +21,6 @@ */ enum dma_ch { /* DMA0/SDMA0 */ - DMACH_DT_PROP = -1, /* not yet supported, do not use */ DMACH_UART0 = 0, DMACH_UART0_SRC2, DMACH_UART1, diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c index 71d58dd..ec0d731 100644 --- a/arch/arm/plat-samsung/dma-ops.c +++ b/arch/arm/plat-samsung/dma-ops.c @@ -23,23 +23,15 @@ static unsigned samsung_dmadev_request(enum dma_ch dma_ch, struct device *dev, char *ch_name) { dma_cap_mask_t mask; - void *filter_param; dma_cap_zero(mask); dma_cap_set(param->cap, mask); - /* - * If a dma channel property of a device node from device tree is - * specified, use that as the fliter parameter. - */ - filter_param = (dma_ch == DMACH_DT_PROP) ? - (void *)param->dt_dmach_prop : (void *)dma_ch; - if (dev->of_node) return (unsigned)dma_request_slave_channel(dev, ch_name); else return (unsigned)dma_request_channel(mask, pl330_filter, - filter_param); + (void *)dma_ch); } static int samsung_dmadev_release(unsigned ch, void *param) diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h index 1141782..ce6d763 100644 --- a/arch/arm/plat-samsung/include/plat/dma-ops.h +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h @@ -18,7 +18,6 @@ struct samsung_dma_req { enum dma_transaction_type cap; - struct property *dt_dmach_prop; struct s3c2410_dma_client *client; }; diff --git a/arch/arm/plat-samsung/include/plat/dma-pl330.h b/arch/arm/plat-samsung/include/plat/dma-pl330.h index d384a80..abe07fa 100644 --- a/arch/arm/plat-samsung/include/plat/dma-pl330.h +++ b/arch/arm/plat-samsung/include/plat/dma-pl330.h @@ -21,7 +21,6 @@ * use these just as IDs. */ enum dma_ch { - DMACH_DT_PROP = -1, DMACH_UART0_RX = 0, DMACH_UART0_TX, DMACH_UART1_RX,