linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Cercueil <paul@crapouillou.net>
To: Vinod Koul <vkoul@kernel.org>, Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Ralf Baechle <ralf@linux-mips.org>,
	Paul Burton <paul.burton@mips.com>,
	James Hogan <jhogan@kernel.org>,
	Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
Cc: Mathieu Malaterre <malat@debian.org>,
	Daniel Silsby <dansilsby@gmail.com>,
	dmaengine@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-mips@linux-mips.org
Subject: [PATCH 12/14] dmaengine: dma-jz4780: Use dma_set_residue()
Date: Tue,  3 Jul 2018 14:32:12 +0200	[thread overview]
Message-ID: <20180703123214.23090-13-paul@crapouillou.net> (raw)
In-Reply-To: <20180703123214.23090-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>
---
 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 690b853977b2..084b7a46a68d 100644
--- a/drivers/dma/dma-jz4780.c
+++ b/drivers/dma/dma-jz4780.c
@@ -633,6 +633,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))
@@ -643,13 +644,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.18.0


  parent reply	other threads:[~2018-07-03 12:33 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-03 12:32 [PATCH 00/14] dma-jz4780 improvements Paul Cercueil
2018-07-03 12:32 ` [PATCH 01/14] dmaengine: dma-jz4780: Avoid hardcoding number of channels Paul Cercueil
2018-07-04 16:28   ` PrasannaKumar Muralidharan
2018-07-05 18:26     ` Paul Cercueil
2018-07-07  7:34       ` PrasannaKumar Muralidharan
2018-07-07 11:01         ` Paul Cercueil
2018-07-09 16:59   ` Vinod
     [not found]     ` <1531236550.17118.0@crapouillou.net>
2018-07-11 12:14       ` Vinod
2018-07-03 12:32 ` [PATCH 02/14] dmaengine: dma-jz4780: Separate chan/ctrl registers Paul Cercueil
2018-07-03 16:53   ` Paul Burton
2018-07-05 18:23     ` Paul Cercueil
2018-07-04 16:35   ` PrasannaKumar Muralidharan
2018-07-05 21:45     ` Paul Cercueil
2018-07-07  7:27       ` PrasannaKumar Muralidharan
2018-07-09 17:03   ` Vinod
2018-07-10 15:36     ` Paul Cercueil
2018-07-11 12:16       ` Vinod
2018-07-11 23:13         ` Paul Cercueil
2018-07-11 23:27         ` Paul Burton
2018-07-16 21:28           ` Rob Herring
2018-07-03 12:32 ` [PATCH 03/14] dmaengine: dma-jz4780: Use 4-word descriptors Paul Cercueil
2018-07-04 16:40   ` PrasannaKumar Muralidharan
2018-07-03 12:32 ` [PATCH 04/14] dmaengine: dma-jz4780: Add support for the JZ4770 SoC Paul Cercueil
2018-07-09 17:10   ` Vinod
2018-07-10 15:41     ` Paul Cercueil
2018-07-03 12:32 ` [PATCH 05/14] dmaengine: dma-jz4780: Add support for the JZ4740 SoC Paul Cercueil
2018-07-04 16:52   ` PrasannaKumar Muralidharan
2018-07-09 17:12   ` Vinod
2018-07-16 21:33     ` Rob Herring
2018-07-17 11:00       ` Paul Cercueil
2018-07-17 15:34       ` Vinod
2018-07-17 17:40         ` Rob Herring
2018-07-18  5:27           ` Vinod
2018-07-03 12:32 ` [PATCH 06/14] dmaengine: dma-jz4780: Add support for the JZ4725B SoC Paul Cercueil
2018-07-04 16:55   ` PrasannaKumar Muralidharan
2018-07-09 17:14   ` Vinod
2018-07-10 15:45     ` Paul Cercueil
2018-07-11 12:18       ` Vinod
2018-07-11 23:13         ` Paul Cercueil
2018-07-03 12:32 ` [PATCH 07/14] dmaengine: dma-jz4780: Enable Fast DMA to the AIC Paul Cercueil
2018-07-04 17:00   ` PrasannaKumar Muralidharan
2018-07-03 12:32 ` [PATCH 08/14] dmaengine: dma-jz4780: Add missing residue DTC mask Paul Cercueil
2018-07-03 12:32 ` [PATCH 09/14] dmaengine: dma-jz4780: Simplify jz4780_dma_desc_residue() Paul Cercueil
2018-07-03 12:32 ` [PATCH 10/14] dmaengine: dma-jz4780: Set DTCn register explicitly Paul Cercueil
2018-07-03 12:32 ` [PATCH 11/14] dmaengine: dma-jz4780: Further residue status fix Paul Cercueil
2018-07-03 12:32 ` Paul Cercueil [this message]
2018-07-03 12:32 ` [PATCH 13/14] MIPS: JZ4780: DTS: Update DMA node to match driver changes Paul Cercueil
2018-07-03 12:32 ` [PATCH 14/14] MIPS: JZ4770: DTS: Add DMA nodes Paul Cercueil
2018-07-03 19:32 ` [PATCH 00/14] dma-jz4780 improvements Mathieu Malaterre

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=20180703123214.23090-13-paul@crapouillou.net \
    --to=paul@crapouillou.net \
    --cc=Zubair.Kakakhel@imgtec.com \
    --cc=dansilsby@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dmaengine@vger.kernel.org \
    --cc=jhogan@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@linux-mips.org \
    --cc=malat@debian.org \
    --cc=mark.rutland@arm.com \
    --cc=paul.burton@mips.com \
    --cc=ralf@linux-mips.org \
    --cc=robh+dt@kernel.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;
as well as URLs for NNTP newsgroup(s).