From patchwork Mon Feb 11 08:38:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 2123541 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 48D1F3FCA4 for ; Mon, 11 Feb 2013 08:38:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751936Ab3BKIiL (ORCPT ); Mon, 11 Feb 2013 03:38:11 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:63940 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751219Ab3BKIiL (ORCPT ); Mon, 11 Feb 2013 03:38:11 -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 <0MI1008Q7RZ7XJ60@mailout3.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 11 Feb 2013 17:38:09 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.123]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id F4.0A.03880.1FDA8115; Mon, 11 Feb 2013 17:38:09 +0900 (KST) X-AuditID: cbfee61b-b7fb06d000000f28-6b-5118adf12472 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 93.0A.03880.1FDA8115; Mon, 11 Feb 2013 17:38:09 +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 <0MI1001YDRZ0HC30@mmp1.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 11 Feb 2013 17:38:09 +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, robherring2@gmail.com Subject: [PATCH V4 5/5] ARM: SAMSUNG: dma: Remove unnecessary code Date: Mon, 11 Feb 2013 14:08:25 +0530 Message-id: <1360571905-15285-6-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1360571905-15285-1-git-send-email-padma.v@samsung.com> References: <1360571905-15285-1-git-send-email-padma.v@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrMLMWRmVeSWpSXmKPExsWyRsSkWvfjWolAg3UbLCxmnN/H5MDo8XmT XABjFJdNSmpOZllqkb5dAldGS2c/S8FGiYpLiycwNjDOE+li5OSQEDCReLupiQXCFpO4cG89 G4gtJLCUUeLZPQOYmk8vXjB1MXIBxRcxSpz6+oodwtnEJHH3SD9jFyMHB5uAjkTLWReQuIjA HEaJ5u0zGEEcZoEJTBITF61mBxklLOAkseTnOyYQm0VAVWJC/zwwm1fAWeLK6WdMEOsUJI5N /coKYnMKuEisPHSTFeIkZ4ljZ4+wgQyVELjOJvF3ciPUIAGJb5MPsYBcISEgK7HpADPEHEmJ gytusExgFF7AyLCKUTS1ILmgOCk910ivODG3uDQvXS85P3cTIzAIT/97Jr2DcVWDxSFGAQ5G JR7egFCJQCHWxLLiytxDjBIczEoivMcPiQcK8aYkVlalFuXHF5XmpBYfYkwGWj6RWUo0OR8Y IXkl8YbGJuamxqaWRkZmpqakCSuJ8zKeehIgJJCeWJKanZpakFoEs4WJg1OqgbGkPiH63//+ OZe/Z/yd/C6s/vKdebaa+5nLnBzaZETZ8lTqz0dmKexNex1voLhKy3Bd2sm7ZitWzJxbb3Dp 09Xjqa5Os8JsF/x/ylIpee6TgdX1qiuWedtNOkyN9u6vynt6/fzxb8tfLFrHuOzz/FJ78e7C yr6J34R9ezb9OOLR7SPyuGJCYo8SS3FGoqEWc1FxIgCpOpyzhgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrMIsWRmVeSWpSXmKPExsVy+t9jAd2PayUCDRaf07aYcX4fkwOjx+dN cgGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhDWMGS2d/SwFGyUqLi2ewNjA OE+ki5GTQ0LAROLTixdMELaYxIV769m6GLk4hAQWMUqc+vqKHcLZxCRx90g/YxcjBwebgI5E y1kXkLiIwBxGiebtMxhBHGaBCUwSExetZgcZJSzgJLHk5zuwsSwCqhIT+ueB2bwCzhJXTj+D WqcgcWzqV1YQm1PARWLloZtgthBQzbGzR9gmMPIuYGRYxSiaWpBcUJyUnmukV5yYW1yal66X nJ+7iREc5M+kdzCuarA4xCjAwajEwxsQKhEoxJpYVlyZe4hRgoNZSYT3+CHxQCHelMTKqtSi /Pii0pzU4kOMyUBXTWSWEk3OB0ZgXkm8obGJuamxqaWJhYmZJWnCSuK8jKeeBAgJpCeWpGan phakFsFsYeLglGpgZN5y4Jx0/68vl/l+M2n1XO3adyS+++HtjFn53rfWJT9iOXjo2IIjlUb8 G9dOX84545d30fbK8PuanxOfLLhxcl3A7gcCy4ok7lUXTbxq+sZyt/oFtjSuCewnJ4is4AhM zTycc0IiPeNB3BcmnWppi18XA2I+cLmGWgSaCSYGpbkH3VBYyfZtmhJLcUaioRZzUXEiAOTY uI62AgAA 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,