From patchwork Mon Feb 4 08:47:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 2089721 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 108A2DFE82 for ; Mon, 4 Feb 2013 08:47:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753969Ab3BDIrZ (ORCPT ); Mon, 4 Feb 2013 03:47:25 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:28956 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753691Ab3BDIrY (ORCPT ); Mon, 4 Feb 2013 03:47:24 -0500 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 <0MHO00B7OTQHPRV0@mailout4.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 04 Feb 2013 17:47:23 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.123]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 16.F1.03918.B957F015; Mon, 04 Feb 2013 17:47:23 +0900 (KST) X-AuditID: cbfee61a-b7f7d6d000000f4e-42-510f759b8fa1 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 04.F1.03918.A957F015; Mon, 04 Feb 2013 17:47:22 +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 <0MHO00DF3TQQ7V60@mmp1.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 04 Feb 2013 17:47:22 +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 Cc: sbkim73@samsung.com, broonie@opensource.wolfsonmicro.com, kgene.kim@samsung.com, jassisinghbrar@gmail.com, arnd@arndb.de, vinod.koul@intel.com, grant.likely@secretlab.ca, jon-hunter@ti.com, boojin.kim@samsung.com, thomas.abraham@linaro.org Subject: [PATCH] ARM: SAMSUNG: dma: Remove unnecessary code Date: Mon, 04 Feb 2013 14:17:55 +0530 Message-id: <1359967675-624-1-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNLMWRmVeSWpSXmKPExsWyRsSkWnd2KX+gwaqfvBYzzu9jcmD0+LxJ LoAxissmJTUnsyy1SN8ugStj09S9bAUPJCterpjH1sC4UbSLkZNDQsBEYum0zawQtpjEhXvr 2boYuTiEBJYySny43MIKU/Rl0XaoxCJGic3v3rBDOJuYJB78WwrkcHCwCehItJx1AYmLCMxh lGjePoMRxGEW+Mko8aLvMdgoYQFrifYHrWA2i4CqxIE/PSwgzbwCjhIts1kgtilIHJv6lRWk V0JgB5vEgZOX2CDqBSS+TT4EVi8hICux6QAzRL2kxMEVN1gmMAouYGRYxSiaWpBcUJyUnmuo V5yYW1yal66XnJ+7iREYVKf/PZPawbiyweIQowAHoxIPL8MvvkAh1sSy4srcQ4wSHMxKIrxX jYBCvCmJlVWpRfnxRaU5qcWHGJOBlk9klhJNzgcGfF5JvKGxibmpsamlkZGZqSlpwkrivIyn ngQICaQnlqRmp6YWpBbBbGHi4JRqYCw9xGqaH3O1wXv+32s/5siFfp4zmV9rnvUbft3se39f 7f2+IGX1yn/zxCZ2MEzet6DpfX6Uq0b8ycMBs545vulj3mfPKNfYUMHhyf/kB0uk3Pctl9c1 XvdLSFrK6GbR9VOQ5Xn8yiVzGSv0KgwdTmy6pKvi4dv/8chi7UXHeXtC+adJ9z97063EUpyR aKjFXFScCADuagacbgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e+xgO6sUv5Ag59LLC1mnN/H5MDo8XmT XABjVAOjTUZqYkpqkUJqXnJ+SmZeuq2Sd3C8c7ypmYGhrqGlhbmSQl5ibqqtkotPgK5bZg7Q VCWFssScUqBQQGJxsZK+HaYJoSFuuhYwjRG6viFBcD1GBmggYQ1jxqape9kKHkhWvFwxj62B caNoFyMnh4SAicSXRdvZIGwxiQv31gPZXBxCAosYJTa/e8MO4WxiknjwbymQw8HBJqAj0XLW BSQuIjCHUaJ5+wxGEIdZ4CejxIu+x6wgo4QFrCXaH7SC2SwCqhIH/vSwgDTzCjhKtMxmgdim IHFs6lfWCYzcCxgZVjGKphYkFxQnpeca6hUn5haX5qXrJefnbmIEh+wzqR2MKxssDjEKcDAq 8fAy/OILFGJNLCuuzD3EKMHBrCTCe9UIKMSbklhZlVqUH19UmpNafIgxGWj5RGYp0eR8YDzl lcQbGpuYmxqbWppYmJhZkiasJM7LeOpJgJBAemJJanZqakFqEcwWJg5OqQZGuZiGwwVV0xcs VzPYoXAo12bhwgNTK7nnbqn+cC4nken0tY+3Fs/OSY6dFX7+z8ONea7fCg/8XWhm+fpM5dRb R1vvFU1I6fV6emzr1uTkwmCjBq/PU2OOHZH4srT6BkNbhG1Q9bQao3XibKJ2d/6wxMzpffTP Oilvgp7vttRc05bdwmXH9hm2K7EUZyQaajEXFScCAIUVO4idAgAA 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 --- The functionality of this patch is dependent on following patches in the link. http://www.mail-archive.com/linux-samsung-soc@vger.kernel.org/msg15402.html This patch is made based on Mark Brown next branch. 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,