From patchwork Tue Apr 2 11:30:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 2377291 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 DB90F3FDDA for ; Tue, 2 Apr 2013 11:34:53 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UMzRa-0006Fh-Jn; Tue, 02 Apr 2013 11:32:02 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UMzRU-0006CO-Dy for linux-arm-kernel@lists.infradead.org; Tue, 02 Apr 2013 11:31:58 +0000 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKM00AJ0LD4W2Q0@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 02 Apr 2013 20:31:54 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.126]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 41.A6.02019.AA1CA515; Tue, 02 Apr 2013 20:31:54 +0900 (KST) X-AuditID: cbfee690-b7f656d0000007e3-a9-515ac1aabde6 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 73.9C.17838.AA1CA515; Tue, 02 Apr 2013 20:31:54 +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 <0MKM00D6JLAFAX50@mmp1.samsung.com>; Tue, 02 Apr 2013 20:31:54 +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 RESEND] ARM: SAMSUNG: dma: Remove unnecessary code Date: Tue, 02 Apr 2013 17:00:39 +0530 Message-id: <1364902239-16704-1-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgkeLIzCtJLcpLzFFi42JZI2JSp7vqYFSgwcdtQhZ/Jx1jt3hz8g+b xb/Zp9gsehdcZbPY9Pgaq8WM8/uYLNqXzWG1+H3zO5vFxRVfmCyOzVjCaPGybz+LA7fH71+T GD12zrrL7rF4z0smjzvX9rB5bF5S7/Fy4m82j74tqxg9Pm+SC+CI4rJJSc3JLEst0rdL4Mpo 6exnKdgoUXFp8QTGBsZ5Il2MnBwSAiYSk3/uZ4KwxSQu3FvP1sXIxSEksJRR4tan96wwRTOP zYVKLGKUuLZjOiOE08MkserCEfYuRg4ONgEdiZazLiANIgLlEvcfPgBrZhZYzyhx/SELiC0s 4CTxqWMJ2DYWAVWJF9/+gtXwCjhLtL/qY4ZYpiBxbOpXVpD5EgLb2CVevJ7GDtEgIPFt8iEW kF0SArISmw5A1UtKHFxxg2UCo+ACRoZVjKKpBckFxUnpRSZ6xYm5xaV56XrJ+bmbGIGhf/rf swk7GO8dsD7EmAw0biKzlGhyPjB28kriDY3NjCxMTUyNjcwtzUgTVhLnVW+xDhQSSE8sSc1O TS1ILYovKs1JLT7EyMTBKdXAmOuf0mA4d2l2/tFTtotv37C7JLb57vYN7bJczVOL02alfjF6 689qGTZxctjOI8ZTUy7vFF76s0M/bNM2cYuc7D8lRXkFLaJBPgwta3TP/Ps9q/DWxSOHeGoM +1P6WUUKsn/uP7fvw5pkwSqu57olEwUOfJB59qiJ711iEuOZ9RkT+59er184SYmlOCPRUIu5 qDgRAJ0fUhOTAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrLIsWRmVeSWpSXmKPExsVy+t9jAd1VB6MCDe7d4bL4O+kYu8Wbk3/Y LP7NPsVm0bvgKpvFpsfXWC1mnN/HZNG+bA6rxe+b39ksLq74wmRxbMYSRouXfftZHLg9fv+a xOixc9Zddo/Fe14yedy5tofNY/OSeo+XE3+zefRtWcXo8XmTXABHVAOjTUZqYkpqkUJqXnJ+ SmZeuq2Sd3C8c7ypmYGhrqGlhbmSQl5ibqqtkotPgK5bZg7QpUoKZYk5pUChgMTiYiV9O0wT QkPcdC1gGiN0fUOC4HqMDNBAwhrGjJbOfpaCjRIVlxZPYGxgnCfSxcjJISFgIjHz2Fw2CFtM 4sK99UA2F4eQwCJGiWs7pjNCOD1MEqsuHGHvYuTgYBPQkWg56wLSICJQLnH/4QNWEJtZYD2j xPWHLCC2sICTxKeOJUwgNouAqsSLb3/BangFnCXaX/UxQyxTkDg29SvrBEbuBYwMqxhFUwuS C4qT0nMN9YoTc4tL89L1kvNzNzGCI+uZ1A7GlQ0WhxgFOBiVeHgd5kQGCrEmlhVX5h5ilOBg VhLhjdsZFSjEm5JYWZValB9fVJqTWnyIMRlo+0RmKdHkfGDU55XEGxqbmJsam1qaWJiYWZIm rCTOe6DVOlBIID2xJDU7NbUgtQhmCxMHp1QDY8ehQ3eSeMSY5+1gbUi8seiCwurz8+enGPOr b3Ls1wz56q2T+236JunmR8Fz/2SrH7G/3p3ZqVDJOddr9mVztsrk9mdVO/Zr7j54X7zaabvA Hpc1SQ1O+e3KL6u9Xf4m6MvNE7tXdPJE4vNYxUN9Qnz/tp19t3jC6hxbnvX8WRdOZfv/4lzY psRSnJFoqMVcVJwIABgrMFjwAgAA 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-20130402_073156_746715_ECAE599F X-CRM114-Status: GOOD ( 12.05 ) X-Spam-Score: -9.1 (---------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-9.1 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 -2.3 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.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" 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,