linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: "Ira W. Snyder" <iws@ovro.caltech.edu>
To: linux-crypto@vger.kernel.org
Cc: B32616@freescale.com, linuxppc-dev@lists.ozlabs.org,
	"Ira W. Snyder" <iws@ovro.caltech.edu>
Subject: [PATCH 7/7] carma: remove unnecessary DMA_INTERRUPT capability
Date: Tue, 31 Jul 2012 16:45:52 -0700	[thread overview]
Message-ID: <1343778352-5549-8-git-send-email-iws@ovro.caltech.edu> (raw)
In-Reply-To: <1343778352-5549-1-git-send-email-iws@ovro.caltech.edu>

From: "Ira W. Snyder" <iws@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@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);
 
-- 
1.7.8.6

  parent reply	other threads:[~2012-07-31 23:46 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-31 23:45 [PATCH 0/7] fsl-dma: fixes for Freescale DMA driver Ira W. Snyder
2012-07-31 23:45 ` [PATCH 1/7] fsl-dma: remove attribute DMA_INTERRUPT of dmaengine Ira W. Snyder
2012-07-31 23:45 ` [PATCH 2/7] fsl-dma: minimize locking overhead Ira W. Snyder
2012-07-31 23:45 ` [PATCH 3/7] fsl-dma: add fsl_dma_free_descriptor() to reduce code duplication Ira W. Snyder
2012-07-31 23:45 ` [PATCH 4/7] fsl-dma: move functions to avoid forward declarations Ira W. Snyder
2012-07-31 23:45 ` [PATCH 5/7] fsl-dma: fix support for async_tx API Ira W. Snyder
2012-08-01  6:03   ` Liu Qiang-B32616
2012-07-31 23:45 ` [PATCH 6/7] fsl-dma: fix a warning of unitialized cookie Ira W. Snyder
2012-07-31 23:45 ` Ira W. Snyder [this message]
2012-08-01  3:56   ` [PATCH 7/7] carma: remove unnecessary DMA_INTERRUPT capability Liu Qiang-B32616
2012-08-01  3:47 ` [PATCH 0/7] fsl-dma: fixes for Freescale DMA driver Liu Qiang-B32616

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1343778352-5549-8-git-send-email-iws@ovro.caltech.edu \
    --to=iws@ovro.caltech.edu \
    --cc=B32616@freescale.com \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).