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: 2102131 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 BB1F73FCFC for ; Wed, 6 Feb 2013 06:18:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751938Ab3BFGSi (ORCPT ); Wed, 6 Feb 2013 01:18:38 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:60543 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751890Ab3BFGSh (ORCPT ); Wed, 6 Feb 2013 01:18:37 -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 <0MHS00ESTC6I63N0@mailout3.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 06 Feb 2013 15:18:36 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.124]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 0E.2F.03880.CB5F1115; Wed, 06 Feb 2013 15:18:36 +0900 (KST) X-AuditID: cbfee61b-b7fb06d000000f28-e2-5111f5bcaa23 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id FC.2F.03880.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-samsung-soc@vger.kernel.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 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 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+NgFvrMLMWRmVeSWpSXmKPExsWyRsSkRnfPV8FAg90HDCxmnN/H5MDo8XmT XABjFJdNSmpOZllqkb5dAlfGlXcdzAUdEhWtn++xNTD+Eu5i5OSQEDCRePfkJguELSZx4d56 ti5GLg4hgaWMEttu3WGCKZp5vAkqsYhR4tGfB0wQziYmiU8/NjN3MXJwsAnoSLScdQGJiwjM YZRo3j6DEcRhFvjJKPGi7zEryChhASeJg/M2soHYLAKqErMeX2QEaeYFip/7VguxTUHi2NSv YOWcAs4Syzr6GEFsIaCSl2uvs4LMlBC4zCbRe+oaM8QcAYlvkw+xgMyREJCV2HSAGWKOpMTB FTdYJjAKL2BkWMUomlqQXFCclJ5rpFecmFtcmpeul5yfu4kRGISn/z2T3sG4qsHiEKMAB6MS D+8NPcFAIdbEsuLK3EOMEhzMSiK8tp+BQrwpiZVVqUX58UWlOanFhxiTgZZPZJYSTc4HRkhe SbyhsYm5qbGppZGRmakpacJK4ryMp54ECAmkJ5akZqemFqQWwWxh4uCUamCc7+i2NOnN0YRH cidPVX4Q+rfkbL1C4USehwEqlubd3b5fMi+8EzebMlfa5ZDLl7I3LybuUT6x8U31pt7i+BNH NRcWxTD7ZLSI7jyvX3fwdcGt+60b7+7cf+993yT+fBP52Vcm3njVd2BLlmvVyid8G+zmzf/E wT+teumjjbPdY13fOwW/Tef9r8RSnJFoqMVcVJwIAInp00iGAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrEIsWRmVeSWpSXmKPExsVy+t9jAd09XwUDDQ5uU7CYcX4fkwOjx+dN cgGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhDWMGVfedTAXdEhUtH6+x9bA +Eu4i5GTQ0LARGLm8SY2CFtM4sK99UA2F4eQwCJGiUd/HjBBOJuYJD792MzcxcjBwSagI9Fy 1gUkLiIwh1GiefsMRhCHWeAno8SLvsesIKOEBZwkDs7bCDaWRUBVYtbji4wgzbxA8XPfaiG2 KUgcm/oVrJxTwFliWUcfI4gtBFTycu111gmMvAsYGVYxiqYWJBcUJ6XnGukVJ+YWl+al6yXn 525iBIf4M+kdjKsaLA4xCnAwKvHw3tATDBRiTSwrrsw9xCjBwawkwmv7GSjEm5JYWZValB9f VJqTWnyIMRnoqInMUqLJ+cD4yyuJNzQ2MTc1NrU0sTAxsyRNWEmcl/HUkwAhgfTEktTs1NSC 1CKYLUwcnFINjHGvXKc6yJz5z357q63T36XLQ896xB33ZU49w9yY6/VqhY5bktvKJMZykW/L vOpSN3xlSZRaMlU8tDCx9Vx4yNKC2Q6LdmSv5r7VJ1t59+s5qeQ1CzrYNrcFSSyLtVrtuPiC 8MRdW+se35/99OoknuOd/NFSoV855hxRLGF3fividUzMt2TzWyWW4oxEQy3mouJEABTN9Py1 AgAA 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,