diff options
author | Padmavathi Venna <padma.v@samsung.com> | 2013-04-08 08:42:10 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-08 08:42:10 -0400 |
commit | ba7a9a784fbcfe1f0d9b3613c78f21a6fec94768 (patch) | |
tree | f6eb17697176dede2ef8880e683170eff0bd5da7 /arch/arm/plat-samsung | |
parent | ca4838487901c82de69b71f1a38c553f495d749f (diff) |
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>
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r-- | arch/arm/plat-samsung/dma-ops.c | 10 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/dma-ops.h | 1 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/dma-pl330.h | 1 |
3 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c index 71d58ddea9c1..ec0d731b0e7b 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, | |||
23 | struct device *dev, char *ch_name) | 23 | struct device *dev, char *ch_name) |
24 | { | 24 | { |
25 | dma_cap_mask_t mask; | 25 | dma_cap_mask_t mask; |
26 | void *filter_param; | ||
27 | 26 | ||
28 | dma_cap_zero(mask); | 27 | dma_cap_zero(mask); |
29 | dma_cap_set(param->cap, mask); | 28 | dma_cap_set(param->cap, mask); |
30 | 29 | ||
31 | /* | ||
32 | * If a dma channel property of a device node from device tree is | ||
33 | * specified, use that as the fliter parameter. | ||
34 | */ | ||
35 | filter_param = (dma_ch == DMACH_DT_PROP) ? | ||
36 | (void *)param->dt_dmach_prop : (void *)dma_ch; | ||
37 | |||
38 | if (dev->of_node) | 30 | if (dev->of_node) |
39 | return (unsigned)dma_request_slave_channel(dev, ch_name); | 31 | return (unsigned)dma_request_slave_channel(dev, ch_name); |
40 | else | 32 | else |
41 | return (unsigned)dma_request_channel(mask, pl330_filter, | 33 | return (unsigned)dma_request_channel(mask, pl330_filter, |
42 | filter_param); | 34 | (void *)dma_ch); |
43 | } | 35 | } |
44 | 36 | ||
45 | static int samsung_dmadev_release(unsigned ch, void *param) | 37 | 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 114178268b75..ce6d7634b6cb 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 @@ | |||
18 | 18 | ||
19 | struct samsung_dma_req { | 19 | struct samsung_dma_req { |
20 | enum dma_transaction_type cap; | 20 | enum dma_transaction_type cap; |
21 | struct property *dt_dmach_prop; | ||
22 | struct s3c2410_dma_client *client; | 21 | struct s3c2410_dma_client *client; |
23 | }; | 22 | }; |
24 | 23 | ||
diff --git a/arch/arm/plat-samsung/include/plat/dma-pl330.h b/arch/arm/plat-samsung/include/plat/dma-pl330.h index d384a8016b47..abe07fae71db 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 @@ | |||
21 | * use these just as IDs. | 21 | * use these just as IDs. |
22 | */ | 22 | */ |
23 | enum dma_ch { | 23 | enum dma_ch { |
24 | DMACH_DT_PROP = -1, | ||
25 | DMACH_UART0_RX = 0, | 24 | DMACH_UART0_RX = 0, |
26 | DMACH_UART0_TX, | 25 | DMACH_UART0_TX, |
27 | DMACH_UART1_RX, | 26 | DMACH_UART1_RX, |