linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: <hongbo.zhang@freescale.com>
To: <vkoul@infradead.org>, <dan.j.williams@intel.com>,
	<dmaengine@vger.kernel.org>
Cc: scottwood@freescale.com,
	Hongbo Zhang <hongbo.zhang@freescale.com>,
	linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
	leo.li@freescale.com
Subject: [PATCH v3 3/8] DMA: Freescale: remove attribute DMA_INTERRUPT of dmaengine
Date: Thu, 10 Apr 2014 15:10:00 +0800	[thread overview]
Message-ID: <1397113805-24171-4-git-send-email-hongbo.zhang@freescale.com> (raw)
In-Reply-To: <1397113805-24171-1-git-send-email-hongbo.zhang@freescale.com>

From: Hongbo Zhang <hongbo.zhang@freescale.com>

Delete attribute DMA_INTERRUPT because fsldma doesn't support this function,
exception will be thrown if talitos is used to offload xor at the same time.

Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com>
Signed-off-by: Qiang Liu <qiang.liu@freescale.com>
---
 drivers/dma/fsldma.c |   31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 5f32cb8..b71cc04 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -528,35 +528,6 @@ static void fsl_dma_free_chan_resources(struct dma_chan *dchan)
 }
 
 static struct dma_async_tx_descriptor *
-fsl_dma_prep_interrupt(struct dma_chan *dchan, unsigned long flags)
-{
-	struct fsldma_chan *chan;
-	struct fsl_desc_sw *new;
-
-	if (!dchan)
-		return NULL;
-
-	chan = to_fsl_chan(dchan);
-
-	new = fsl_dma_alloc_descriptor(chan);
-	if (!new) {
-		chan_err(chan, "%s\n", msg_ld_oom);
-		return NULL;
-	}
-
-	new->async_tx.cookie = -EBUSY;
-	new->async_tx.flags = flags;
-
-	/* Insert the link descriptor to the LD ring */
-	list_add_tail(&new->node, &new->tx_list);
-
-	/* Set End-of-link to the last link descriptor of new list */
-	set_ld_eol(chan, new);
-
-	return &new->async_tx;
-}
-
-static struct dma_async_tx_descriptor *
 fsl_dma_prep_memcpy(struct dma_chan *dchan,
 	dma_addr_t dma_dst, dma_addr_t dma_src,
 	size_t len, unsigned long flags)
@@ -1308,12 +1279,10 @@ static int fsldma_of_probe(struct platform_device *op)
 	fdev->irq = irq_of_parse_and_map(op->dev.of_node, 0);
 
 	dma_cap_set(DMA_MEMCPY, fdev->common.cap_mask);
-	dma_cap_set(DMA_INTERRUPT, fdev->common.cap_mask);
 	dma_cap_set(DMA_SG, fdev->common.cap_mask);
 	dma_cap_set(DMA_SLAVE, fdev->common.cap_mask);
 	fdev->common.device_alloc_chan_resources = fsl_dma_alloc_chan_resources;
 	fdev->common.device_free_chan_resources = fsl_dma_free_chan_resources;
-	fdev->common.device_prep_dma_interrupt = fsl_dma_prep_interrupt;
 	fdev->common.device_prep_dma_memcpy = fsl_dma_prep_memcpy;
 	fdev->common.device_prep_dma_sg = fsl_dma_prep_sg;
 	fdev->common.device_tx_status = fsl_tx_status;
-- 
1.7.9.5

  parent reply	other threads:[~2014-04-10  7:10 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-10  7:09 [PATCH v3 0/8] DMA: Freescale: driver cleanups and enhancements hongbo.zhang
2014-04-10  7:09 ` [PATCH v3 1/8] DMA: Freescale: remove the unnecessary FSL_DMA_LD_DEBUG hongbo.zhang
2014-04-10  7:20   ` [PATCH v3 0/8] DMA: Freescale: driver cleanups and enhancements Hongbo Zhang
2014-04-10  7:09 ` [PATCH v3 2/8] DMA: Freescale: unify register access methods hongbo.zhang
2014-04-10  8:46   ` David Laight
2014-04-10  9:33     ` Hongbo Zhang
2014-04-10  7:10 ` hongbo.zhang [this message]
2014-04-10  7:10 ` [PATCH v3 4/8] DMA: Freescale: add fsl_dma_free_descriptor() to reduce code duplication hongbo.zhang
2014-04-10 11:29   ` Andy Shevchenko
2014-04-11  8:14     ` Hongbo Zhang
2014-04-14 13:40       ` Andy Shevchenko
2014-04-18  4:09         ` Hongbo Zhang
2014-04-10  7:10 ` [PATCH v3 5/8] DMA: Freescale: move functions to avoid forward declarations hongbo.zhang
2014-04-10  7:10 ` [PATCH v3 6/8] DMA: Freescale: change descriptor release process for supporting async_tx hongbo.zhang
2014-04-10 11:56   ` Andy Shevchenko
2014-04-11  8:00     ` Hongbo Zhang
2014-04-11  8:33       ` Hongbo Zhang
2014-04-14 13:41         ` Andy Shevchenko
2014-04-10  7:10 ` [PATCH v3 7/8] DMA: Freescale: use spin_lock_bh instead of spin_lock_irqsave hongbo.zhang
2014-04-10  7:10 ` [PATCH v3 8/8] DMA: Freescale: add suspend resume functions for DMA driver hongbo.zhang
2014-04-10 12:05   ` Andy Shevchenko
2014-04-11  7:42     ` Hongbo Zhang

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=1397113805-24171-4-git-send-email-hongbo.zhang@freescale.com \
    --to=hongbo.zhang@freescale.com \
    --cc=dan.j.williams@intel.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=leo.li@freescale.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=scottwood@freescale.com \
    --cc=vkoul@infradead.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).