From patchwork Wed Feb 6 06:18:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 2102191 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id C7A873FCFC for ; Wed, 6 Feb 2013 06:21:41 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U2yLi-0003lV-V4; Wed, 06 Feb 2013 06:19:14 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U2yLB-0003bl-7F for linux-arm-kernel@lists.infradead.org; Wed, 06 Feb 2013 06:18:42 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MHS005BYC64HKN0@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 06 Feb 2013 15:18:36 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.126]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 3C.F3.03918.CB5F1115; Wed, 06 Feb 2013 15:18:36 +0900 (KST) X-AuditID: cbfee61a-b7f7d6d000000f4e-72-5111f5bcaf43 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 2B.F3.03918.CB5F1115; Wed, 06 Feb 2013 15:18:36 +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 <0MHS001KWC6CC970@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 06 Feb 2013 15:18:36 +0900 (KST) From: Padmavathi Venna To: linux-samsung-soc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, padma.v@samsung.com, padma.kvr@gmail.com Subject: [PATCH V3 5/5] ARM: SAMSUNG: dma: Remove unnecessary code Date: Wed, 06 Feb 2013 11:48:49 +0530 Message-id: <1360131529-2847-6-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1360131529-2847-1-git-send-email-padma.v@samsung.com> References: <1360131529-2847-1-git-send-email-padma.v@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrELMWRmVeSWpSXmKPExsWyRsSkTnfPV8FAgy33VCw2Pb7G6sDosXlJ fQBjFJdNSmpOZllqkb5dAlfGlXcdzAUdEhWtn++xNTD+Eu5i5OSQEDCRmPXqPQuELSZx4d56 ti5GLg4hgaWMElcXHGOBKTow9QUjRGIRo8SXq3dZIZytTBKtzRuBMhwcbAI6Ei1nXUDiIgJz GCWat88A62AW+Mko8aLvMSvIKGEBJ4mD8zaygdgsAqoSsx5fBGvmBYqf+1YLsU1B4tjUr2Dl nALOEss6+hhBbCGgkpdrr7NC1Fxmk/gxvR5ijIDEt8mHWEDGSAjISmw6wAxRIilxcMUNlgmM wgsYGVYxiqYWJBcUJ6XnGuoVJ+YWl+al6yXn525iBIbg6X/PpHYwrmywOMQowMGoxMN7Q08w UIg1say4MvcQowQHs5IIr+1noBBvSmJlVWpRfnxRaU5q8SHGZKDlE5mlRJPzgfGRVxJvaGxi bmpsamlkZGZqSpqwkjgv46knAUIC6YklqdmpqQWpRTBbmDg4pRoYFyxvfzY1VdJ5wwfjVyeY Eq/dOdXbv3JqoMGrwBDX6XtrVfm2i6xYusz2X2y4T90GEb/eD/vL7gQlCLntZPm34+jrsLm8 P+ZeqJx09R5HnOk0f7fETULc7nXZa7+sFdj4+8zMrRemSOTMz6vjsH5ZeUzX6bIct9SKw4v9 di4T7W/vYnrdyzSDWYmlOCPRUIu5qDgRAELZSbyFAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrEIsWRmVeSWpSXmKPExsVy+t9jAd09XwUDDa5dlbLY9PgaqwOjx+Yl 9QGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhDWMGVfedTAXdEhUtH6+x9bA +Eu4i5GTQ0LAROLA1BeMELaYxIV769m6GLk4hAQWMUp8uXqXFcLZyiTR2rwRqIqDg01AR6Ll rAtIXERgDqNE8/YZjCAOs8BPRokXfY9ZQUYJCzhJHJy3kQ3EZhFQlZj1+CJYMy9Q/Ny3Woht ChLHpn4FK+cUcJZY1tEHdoUQUMnLtddZJzDyLmBkWMUomlqQXFCclJ5rqFecmFtcmpeul5yf u4kRHOLPpHYwrmywOMQowMGoxMN7Q08wUIg1say4MvcQowQHs5IIr+1noBBvSmJlVWpRfnxR aU5q8SHGZKCjJjJLiSbnA+MvryTe0NjE3NTY1NLEwsTMkjRhJXFexlNPAoQE0hNLUrNTUwtS i2C2MHFwSjUwzrhyme11RTlHir3Qveyt65wnsOvmhx97/r709Z1efYeja2MnbjkXzjAtc7qC ua9J949vG0r/NHib7r9Tt77h6bLwxPR1Amyqa+I7shM+RF27ZX1pZvXl57k9oSY+2hOMJp5t jO99k/Ss3NA7bbuH1c4alqOJzwIKFlyyzFsRX9e0TrF70vcKJZbijERDLeai4kQAe9KgbLUC AAA= 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-20130206_011841_547640_E5C9497E X-CRM114-Status: GOOD ( 11.93 ) X-Spam-Score: -7.6 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.34 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] Cc: jassisinghbrar@gmail.com, kgene.kim@samsung.com, arnd@arndb.de, boojin.kim@samsung.com, sbkim73@samsung.com, broonie@opensource.wolfsonmicro.com, grant.likely@secretlab.ca, vinod.koul@intel.com, thomas.abraham@linaro.org, jon-hunter@ti.com 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,