summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@nokia.com>2008-02-13 11:47:29 +0200
committerTony Lindgren <tony@atomide.com>2008-03-05 10:23:19 +0200
commit538528de0cb256f65716ab2e9613d9e920f97fe2 (patch)
treec47e3ad5798191ce95d48b8557b3d9b0bde43164 /arch
parent29e8c3c304b62f31b799565c9ee85d42bd163f80 (diff)
downloadop-kernel-dev-538528de0cb256f65716ab2e9613d9e920f97fe2.zip
op-kernel-dev-538528de0cb256f65716ab2e9613d9e920f97fe2.tar.gz
ARM: OMAP: Pass logical DMA channel number always to callback handlers
This makes parameter passing to DMA handlers uniform between non-chained and chained transfers and makes debugging easier. Additional data like chain_id can be always passed to handlers via callback data if needed. Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-omap/dma.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index a46676d..3e94683 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -1705,14 +1705,8 @@ static int omap2_dma_handle_ch(int ch)
status = OMAP_DMA_CSR_REG(ch);
}
- if (likely(dma_chan[ch].callback != NULL)) {
- if (dma_chan[ch].chain_id != -1)
- dma_chan[ch].callback(dma_chan[ch].chain_id, status,
- dma_chan[ch].data);
- else
- dma_chan[ch].callback(ch, status, dma_chan[ch].data);
-
- }
+ if (likely(dma_chan[ch].callback != NULL))
+ dma_chan[ch].callback(ch, status, dma_chan[ch].data);
OMAP_DMA_CSR_REG(ch) = status;
OpenPOWER on IntegriCloud