ARM: SAMSUNG: Remove unnecessary code for dma

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 <padma.v@samsung.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/mach-s3c24xx/include/mach/dma.h b/arch/arm/mach-s3c24xx/include/mach/dma.h
index 6b72d5a4b377981eca1944ecd1f07a0d51871bd4..b55da1d8cd8f0427964c5427ddaed147f9482668 100644 (file)
--- 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 57b1ff4b2d7ce6417cb113770e9a642230f558bc..fe1a98cf0e4c7cb3a63311efec61f507e9ebf8e2 100644 (file)
--- 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 71d58ddea9c1a375efb0366c8fab3d1f1850cd72..ec0d731b0e7b88ed8bc7b2937528545c15f60f6e 100644 (file)
--- 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 114178268b75e70d8e25e5035d893d81c8d8f60b..ce6d7634b6cb0d8f6be56046ca55638ca8bd0747 100644 (file)
--- 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 d384a8016b47d2463218748289cfbac3c8b272cc..abe07fae71dba8bffee0dea0a29cd8f3326d2772 100644 (file)
--- 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,