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: 2140281 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E8FE6DF283 for ; Thu, 14 Feb 2013 03:47:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754257Ab3BNDrW (ORCPT ); Wed, 13 Feb 2013 22:47:22 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:22135 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753055Ab3BNDrV (ORCPT ); Wed, 13 Feb 2013 22:47:21 -0500 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-samsung-soc@vger.kernel.org; Thu, 14 Feb 2013 12:47:20 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.122]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id E8.F1.03880.74E5C115; Thu, 14 Feb 2013 12:47:20 +0900 (KST) X-AuditID: cbfee61b-b7fb06d000000f28-23-511c5e470b00 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id C7.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-samsung-soc@vger.kernel.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 Cc: sbkim73@samsung.com, broonie@opensource.wolfsonmicro.com, kgene.kim@samsung.com, arnd@arndb.de, vinod.koul@intel.com, boojin.kim@samsung.com, thomas.abraham@linaro.org 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+NgFrrOLMWRmVeSWpSXmKPExsWyRsSkStcjTibQoDPYYsb5fUwOjB6fN8kF MEZx2aSk5mSWpRbp2yVwZbR09rMUbJSouLR4AmMD4zyRLkYODgkBE4m+nWZdjJxAppjEhXvr 2boYuTiEBJYySmyZcZsFImEi0Tz7CzNEYhGjxIH/F9ghnE1MEi97vjCBTGIT0JFoOesC0iAi UC5x/+EDVhCbWWA9o8T1h2CDhAWsJdoftILFWQRUJSadPcMIYvMKOEl0LGxmhlimIHFs6ldW CHsPm8S2dcEQ9QIS3yYfYoE4WlZi0wGockmJgytusExgFFzAyLCKUTS1ILmgOCk910ivODG3 uDQvXS85P3cTIzCYTv97Jr2DcVWDxSFGAQ5GJR5ehV/SgUKsiWXFlbmHGCU4mJVEeF8GygQK 8aYkVlalFuXHF5XmpBYfYkwGWj6RWUo0OR8Y6Hkl8YbGJuamxqaWRkZmpqakCSuJ8zKeehIg JJCeWJKanZpakFoEs4WJg1OqgXGx//yXjCGuk3mXqB+ISizo4nzRstpj639f19w9UxLesRup c3z6q20YU6y2R4BxXs/DON5HzHtW86yyD6hvc4lIubepiWNF/alph37drG848IjddgFTqzjT A/EIno5fK1TebExaueGE2pkzH2ft2MVVMt9HIFLT7mrniYAVnx6LCVSqL1JmmKLEUpyRaKjF XFScCAD87a8bagIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeLIzCtJLcpLzFFi42I5/e+xgK57nEygwfyZmhYzzu9jcmD0+LxJ LoAxqoHRJiM1MSW1SCE1Lzk/JTMv3VbJOzjeOd7UzMBQ19DSwlxJIS8xN9VWycUnQNctMwdo qpJCWWJOKVAoILG4WEnfDtOE0BA3XQuYxghd35AguB4jAzSQsIYxo6Wzn6Vgo0TFpcUTGBsY 54l0MXJySAiYSDTP/sIMYYtJXLi3nq2LkYtDSGARo8SB/xfYIZxNTBIve74wdTFycLAJ6Ei0 nHUBaRARKJe4//ABK4jNLLCeUeL6QxYQW1jAWqL9QStYnEVAVWLS2TOMIDavgJNEx8JmqGUK EsemfmWdwMi9gJFhFaNoakFyQXFSeq6RXnFibnFpXrpecn7uJkZwwD6T3sG4qsHiEKMAB6MS D6/CL+lAIdbEsuLK3EOMEhzMSiK8LwNlAoV4UxIrq1KL8uOLSnNSiw8xJgNtn8gsJZqcD4ym vJJ4Q2MTc1NjU0sTCxMzS9KElcR5GU89CRASSE8sSc1OTS1ILYLZwsTBKdXA6PnQY97xJwFz p110PHD4+G3dVcccAj/7dBydP7f0Sc/n7rOHz3uGKt5Nd5SpWZux4vj7nS+PZN6uymHVPS3p d7wv8GT5J6fzHgniqe73y4ynvQ/6kH1y0tKvD4/3cKmzytSc/7rrWPsDscbYmPSzbS+jcu+s +SHgHaTNLLN/MmfOquRfLhduyiixFGckGmoxFxUnAgDf8H/YnAIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.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,