Commit 538528de authored Feb 13, 2008 by Jarkko Nikula Committed by Tony Lindgren Mar 05, 2008

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>

parent 29e8c3c3

arch/arm/plat-omap/dma.c

+2 −8

Original line number	Diff line number	Diff line
		@@ -1705,15 +1705,9 @@ 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
		if (likely(dma_chan[ch].callback != NULL))
		dma_chan[ch].callback(ch, status, dma_chan[ch].data);

		}

		OMAP_DMA_CSR_REG(ch) = status;

		return 0;