Linux MIPS Architecture development
 help / color / mirror / Atom feed
From: Paul Cercueil <paul@crapouillou.net>
To: Vinod Koul <vkoul@kernel.org>, Ralf Baechle <ralf@linux-mips.org>,
	Paul Burton <paul.burton@mips.com>
Cc: od@zcrc.me, dmaengine@vger.kernel.org,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-mips@linux-mips.org, Daniel Silsby <dansilsby@gmail.com>,
	Paul Cercueil <paul@crapouillou.net>
Subject: [PATCH v5 15/18] dmaengine: dma-jz4780: Use dma_set_residue()
Date: Wed, 29 Aug 2018 23:32:57 +0200	[thread overview]
Message-ID: <20180829213300.22829-16-paul@crapouillou.net> (raw)
In-Reply-To: <20180829213300.22829-1-paul@crapouillou.net>

From: Daniel Silsby <dansilsby@gmail.com>

This is the standard method provided by dmaengine header.

Signed-off-by: Daniel Silsby <dansilsby@gmail.com>
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Tested-by: Mathieu Malaterre <malat@debian.org>
---

Notes:
     v2: No change
    
     v3: No change
    
     v4: Add my Signed-off-by
    
     v5: No change

 drivers/dma/dma-jz4780.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c
index b73d96166637..e1bb93dd32ba 100644
--- a/drivers/dma/dma-jz4780.c
+++ b/drivers/dma/dma-jz4780.c
@@ -639,6 +639,7 @@ static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan,
 	struct virt_dma_desc *vdesc;
 	enum dma_status status;
 	unsigned long flags;
+	unsigned long residue = 0;
 
 	status = dma_cookie_status(chan, cookie, txstate);
 	if ((status == DMA_COMPLETE) || (txstate == NULL))
@@ -649,13 +650,13 @@ static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan,
 	vdesc = vchan_find_desc(&jzchan->vchan, cookie);
 	if (vdesc) {
 		/* On the issued list, so hasn't been processed yet */
-		txstate->residue = jz4780_dma_desc_residue(jzchan,
+		residue = jz4780_dma_desc_residue(jzchan,
 					to_jz4780_dma_desc(vdesc), 0);
 	} else if (cookie == jzchan->desc->vdesc.tx.cookie) {
-		txstate->residue = jz4780_dma_desc_residue(jzchan, jzchan->desc,
+		residue = jz4780_dma_desc_residue(jzchan, jzchan->desc,
 					jzchan->curr_hwdesc + 1);
-	} else
-		txstate->residue = 0;
+	}
+	dma_set_residue(txstate, residue);
 
 	if (vdesc && jzchan->desc && vdesc == &jzchan->desc->vdesc
 	    && jzchan->desc->status & (JZ_DMA_DCS_AR | JZ_DMA_DCS_HLT))
-- 
2.11.0

  parent reply	other threads:[~2018-08-29 21:37 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-29 21:32 [PATCH v5 00/18] JZ4780 DMA patchset v5 Paul Cercueil
2018-08-29 21:32 ` [PATCH v5 01/18] dt-bindings: jz4780-dma: Update bindings to reflect driver changes Paul Cercueil
2018-08-29 21:32 ` [PATCH v5 02/18] dmaengine: dma-jz4780: Return error if not probed from DT Paul Cercueil
2018-08-29 21:32 ` [PATCH v5 03/18] dmaengine: dma-jz4780: Avoid hardcoding number of channels Paul Cercueil
2018-08-29 21:32 ` [PATCH v5 04/18] dmaengine: dma-jz4780: Separate chan/ctrl registers Paul Cercueil
2018-08-29 21:32 ` [PATCH v5 05/18] dmaengine: dma-jz4780: Use 4-word descriptors Paul Cercueil
2018-08-29 21:32 ` [PATCH v5 06/18] dmaengine: dma-jz4780: Don't depend on MACH_JZ4780 Paul Cercueil
2018-08-29 21:32 ` [PATCH v5 07/18] dmaengine: dma-jz4780: Add support for the JZ4770 SoC Paul Cercueil
2018-08-29 21:32 ` [PATCH v5 08/18] dmaengine: dma-jz4780: Add support for the JZ4740 SoC Paul Cercueil
2018-08-29 21:32 ` [PATCH v5 09/18] dmaengine: dma-jz4780: Add support for the JZ4725B SoC Paul Cercueil
2018-08-29 21:32 ` [PATCH v5 10/18] dmaengine: dma-jz4780: Enable Fast DMA to the AIC Paul Cercueil
2018-08-29 21:32 ` [PATCH v5 11/18] dmaengine: dma-jz4780: Add missing residue DTC mask Paul Cercueil
2018-08-29 21:32 ` [PATCH v5 12/18] dmaengine: dma-jz4780: Simplify jz4780_dma_desc_residue() Paul Cercueil
2018-08-29 21:32 ` [PATCH v5 13/18] dmaengine: dma-jz4780: Set DTCn register explicitly Paul Cercueil
2018-08-29 21:32 ` [PATCH v5 14/18] dmaengine: dma-jz4780: Further residue status fix Paul Cercueil
2018-08-29 21:32 ` Paul Cercueil [this message]
2018-08-29 21:32 ` [PATCH v5 16/18] MIPS: JZ4780: DTS: Update DMA node to match driver changes Paul Cercueil
2018-08-29 21:32 ` [PATCH v5 17/18] MIPS: JZ4770: DTS: Add DMA nodes Paul Cercueil
2018-08-29 21:33 ` [PATCH v5 18/18] MIPS: JZ4740: " Paul Cercueil
2018-09-11  7:29 ` [PATCH v5 00/18] JZ4780 DMA patchset v5 Vinod

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=20180829213300.22829-16-paul@crapouillou.net \
    --to=paul@crapouillou.net \
    --cc=dansilsby@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dmaengine@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@linux-mips.org \
    --cc=od@zcrc.me \
    --cc=paul.burton@mips.com \
    --cc=ralf@linux-mips.org \
    --cc=vkoul@kernel.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