diff options
author | Alexandre Bounine <alexandre.bounine@idt.com> | 2012-03-08 16:11:18 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-21 09:50:22 -0400 |
commit | 16052827d98fbc13c31ebad560af4bd53e2b4dd5 (patch) | |
tree | aff4f3362a643d2d4621f21dd56996988c0e733c /arch/arm | |
parent | ad1122e545b55013089e6cc18ac37b47b46f2a7d (diff) |
dmaengine/dma_slave: introduce inline wrappers
Add inline wrappers for device_prep_slave_sg() and device_prep_dma_cyclic()
interfaces to hide new parameter from current users of affected interfaces.
Convert current users to use new wrappers instead of direct calls.
Suggested by Russell King [https://lkml.org/lkml/2012/2/3/269].
Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/plat-nomadik/include/plat/ste_dma40.h | 3 | ||||
-rw-r--r-- | arch/arm/plat-samsung/dma-ops.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h index fd0ee84c45d1..9ff93b065686 100644 --- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h +++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h | |||
@@ -200,8 +200,7 @@ dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan, | |||
200 | sg.dma_address = addr; | 200 | sg.dma_address = addr; |
201 | sg.length = size; | 201 | sg.length = size; |
202 | 202 | ||
203 | return chan->device->device_prep_slave_sg(chan, &sg, 1, | 203 | return dmaengine_prep_slave_sg(chan, &sg, 1, direction, flags); |
204 | direction, flags); | ||
205 | } | 204 | } |
206 | 205 | ||
207 | #else | 206 | #else |
diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c index 0747c77a2fd5..a6ef3961134c 100644 --- a/arch/arm/plat-samsung/dma-ops.c +++ b/arch/arm/plat-samsung/dma-ops.c | |||
@@ -79,11 +79,11 @@ static int samsung_dmadev_prepare(unsigned ch, | |||
79 | info->len, offset_in_page(info->buf)); | 79 | info->len, offset_in_page(info->buf)); |
80 | sg_dma_address(&sg) = info->buf; | 80 | sg_dma_address(&sg) = info->buf; |
81 | 81 | ||
82 | desc = chan->device->device_prep_slave_sg(chan, | 82 | desc = dmaengine_prep_slave_sg(chan, |
83 | &sg, 1, info->direction, DMA_PREP_INTERRUPT); | 83 | &sg, 1, info->direction, DMA_PREP_INTERRUPT); |
84 | break; | 84 | break; |
85 | case DMA_CYCLIC: | 85 | case DMA_CYCLIC: |
86 | desc = chan->device->device_prep_dma_cyclic(chan, | 86 | desc = dmaengine_prep_dma_cyclic(chan, |
87 | info->buf, info->len, info->period, info->direction); | 87 | info->buf, info->len, info->period, info->direction); |
88 | break; | 88 | break; |
89 | default: | 89 | default: |