aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/dma-ops.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/plat-samsung/dma-ops.c')
-rw-r--r--arch/arm/plat-samsung/dma-ops.c10
1 files changed, 1 insertions, 9 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
45static int samsung_dmadev_release(unsigned ch, void *param) 37static int samsung_dmadev_release(unsigned ch, void *param)