[PATCH 7/7] carma: remove unnecessary DMA_INTERRUPT capability

[Liu Qiang-B32616]

> -----Original Message-----
> From: Ira W. Snyder [mailto:iws at ovro.caltech.edu]
> Sent: Wednesday, August 01, 2012 7:46 AM
> To: linux-crypto at vger.kernel.org
> Cc: linuxppc-dev at lists.ozlabs.org; Liu Qiang-B32616; Ira W. Snyder
> Subject: [PATCH 7/7] carma: remove unnecessary DMA_INTERRUPT capability
> 
> From: "Ira W. Snyder" <iws at ovro.caltech.edu>
> 
> These drivers set the DMA_INTERRUPT capability bit when requesting a DMA
> controller channel. This was historical, and is no longer needed.
> 
> Recent changes to the drivers/dma/fsldma.c driver have removed support
> for this flag. This makes the carma drivers unable to find a DMA channel
> with the required capabilities.
> 
> Signed-off-by: Ira W. Snyder <iws at ovro.caltech.edu>
> ---
>  drivers/misc/carma/carma-fpga-program.c |    1 -
>  drivers/misc/carma/carma-fpga.c         |    3 +--
>  2 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/misc/carma/carma-fpga-program.c
> b/drivers/misc/carma/carma-fpga-program.c
> index a2d25e4..eaddfe9 100644
> --- a/drivers/misc/carma/carma-fpga-program.c
> +++ b/drivers/misc/carma/carma-fpga-program.c
> @@ -978,7 +978,6 @@ static int fpga_of_probe(struct platform_device *op)
>  	dev_set_drvdata(priv->dev, priv);
>  	dma_cap_zero(mask);
>  	dma_cap_set(DMA_MEMCPY, mask);
> -	dma_cap_set(DMA_INTERRUPT, mask);
>  	dma_cap_set(DMA_SLAVE, mask);
>  	dma_cap_set(DMA_SG, mask);
> 
> diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-
> fpga.c index 8c279da..861b298 100644
> --- a/drivers/misc/carma/carma-fpga.c
> +++ b/drivers/misc/carma/carma-fpga.c
> @@ -666,7 +666,7 @@ static int data_submit_dma(struct fpga_device *priv,
> struct data_buf *buf)
>  	src = SYS_FPGA_BLOCK;
>  	tx = chan->device->device_prep_dma_memcpy(chan, dst, src,
>  						  REG_BLOCK_SIZE,
> -						  DMA_PREP_INTERRUPT);
> +						  0);
>  	if (!tx) {
>  		dev_err(priv->dev, "unable to prep SYS-FPGA DMA\n");
>  		return -ENOMEM;
> @@ -1333,7 +1333,6 @@ static int data_of_probe(struct platform_device *op)
> 
>  	dma_cap_zero(mask);
>  	dma_cap_set(DMA_MEMCPY, mask);
> -	dma_cap_set(DMA_INTERRUPT, mask);
>  	dma_cap_set(DMA_SLAVE, mask);
>  	dma_cap_set(DMA_SG, mask);
Hi Ira, attached link is the comments of Dan Williams to the original patch of fsl-dma.
http://lkml.indiana.edu/hypermail/linux/kernel/0910.1/03836.html

> --
> 1.7.8.6
>