Re: [PATCH] ARM: OMAP: Pass logical DMA channel number always to callback handlers

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



* Jarkko Nikula <jarkko.nikula@xxxxxxxxx> [080213 03:48]:
> 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@xxxxxxxxx>
> ---
>  arch/arm/plat-omap/dma.c |   10 ++--------
>  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;

Pushing today.

Tony
-
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux