All of lore.kernel.org
 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>,
	Paul Cercueil <paul@crapouillou.net>,
	dmaengine@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-mips@linux-mips.org
Subject: [v3,12/18] dmaengine: dma-jz4780: Simplify jz4780_dma_desc_residue()
Date: Sat, 21 Jul 2018 13:06:37 +0200	[thread overview]
Message-ID: <20180721110643.19624-13-paul@crapouillou.net> (raw)

From: Daniel Silsby <dansilsby@gmail.com>

Simple cleanup, no changes to actual logic here.

Signed-off-by: Daniel Silsby <dansilsby@gmail.com>
Tested-by: Mathieu Malaterre <malat@debian.org>
---
 drivers/dma/dma-jz4780.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

 v2: No change

 v3: No change

diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c
index fa926de082ba..cc2a86844db4 100644
--- a/drivers/dma/dma-jz4780.c
+++ b/drivers/dma/dma-jz4780.c
@@ -608,22 +608,17 @@ static size_t jz4780_dma_desc_residue(struct jz4780_dma_chan *jzchan,
 	struct jz4780_dma_desc *desc, unsigned int next_sg)
 {
 	struct jz4780_dma_dev *jzdma = jz4780_dma_chan_parent(jzchan);
-	unsigned int residue, count;
+	unsigned int count = 0;
 	unsigned int i;
 
-	residue = 0;
-
 	for (i = next_sg; i < desc->count; i++)
-		residue += (desc->desc[i].dtc & 0xffffff) <<
-			jzchan->transfer_shift;
+		count += desc->desc[i].dtc & 0xffffff;
 
-	if (next_sg != 0) {
-		count = jz4780_dma_chn_readl(jzdma, jzchan->id,
+	if (next_sg != 0)
+		count += jz4780_dma_chn_readl(jzdma, jzchan->id,
 					 JZ_DMA_REG_DTC);
-		residue += count << jzchan->transfer_shift;
-	}
 
-	return residue;
+	return count << jzchan->transfer_shift;
 }
 
 static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan,

WARNING: multiple messages have this Message-ID (diff)
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>,
	Paul Cercueil <paul@crapouillou.net>,
	dmaengine@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-mips@linux-mips.org
Subject: [PATCH v3 12/18] dmaengine: dma-jz4780: Simplify jz4780_dma_desc_residue()
Date: Sat, 21 Jul 2018 13:06:37 +0200	[thread overview]
Message-ID: <20180721110643.19624-13-paul@crapouillou.net> (raw)
In-Reply-To: <20180721110643.19624-1-paul@crapouillou.net>

From: Daniel Silsby <dansilsby@gmail.com>

Simple cleanup, no changes to actual logic here.

Signed-off-by: Daniel Silsby <dansilsby@gmail.com>
Tested-by: Mathieu Malaterre <malat@debian.org>
---
 drivers/dma/dma-jz4780.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

 v2: No change

 v3: No change

diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c
index fa926de082ba..cc2a86844db4 100644
--- a/drivers/dma/dma-jz4780.c
+++ b/drivers/dma/dma-jz4780.c
@@ -608,22 +608,17 @@ static size_t jz4780_dma_desc_residue(struct jz4780_dma_chan *jzchan,
 	struct jz4780_dma_desc *desc, unsigned int next_sg)
 {
 	struct jz4780_dma_dev *jzdma = jz4780_dma_chan_parent(jzchan);
-	unsigned int residue, count;
+	unsigned int count = 0;
 	unsigned int i;
 
-	residue = 0;
-
 	for (i = next_sg; i < desc->count; i++)
-		residue += (desc->desc[i].dtc & 0xffffff) <<
-			jzchan->transfer_shift;
+		count += desc->desc[i].dtc & 0xffffff;
 
-	if (next_sg != 0) {
-		count = jz4780_dma_chn_readl(jzdma, jzchan->id,
+	if (next_sg != 0)
+		count += jz4780_dma_chn_readl(jzdma, jzchan->id,
 					 JZ_DMA_REG_DTC);
-		residue += count << jzchan->transfer_shift;
-	}
 
-	return residue;
+	return count << jzchan->transfer_shift;
 }
 
 static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan,
-- 
2.11.0


             reply	other threads:[~2018-07-21 11:06 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-21 11:06 Paul Cercueil [this message]
2018-07-21 11:06 ` [PATCH v3 12/18] dmaengine: dma-jz4780: Simplify jz4780_dma_desc_residue() Paul Cercueil
  -- strict thread matches above, loose matches on Subject: below --
2018-08-04  9:02 [v3,07/18] dmaengine: dma-jz4780: Add support for the JZ4770 SoC Paul Cercueil
2018-08-04  9:02 ` [PATCH v3 07/18] " Paul Cercueil
2018-07-30 21:13 [v3,01/18] doc: dt-bindings: jz4780-dma: Update bindings to reflect driver changes Paul Cercueil
2018-07-30 21:13 ` [PATCH v3 01/18] " Paul Cercueil
2018-07-24 23:35 [v3,01/18] " Rob Herring
2018-07-24 23:35 ` [PATCH v3 01/18] " Rob Herring
2018-07-24 16:01 [v3,07/18] dmaengine: dma-jz4780: Add support for the JZ4770 SoC Vinod Koul
2018-07-24 16:01 ` [PATCH v3 07/18] " Vinod
2018-07-24 15:04 [v3,07/18] " Paul Cercueil
2018-07-24 15:04 ` [PATCH v3 07/18] " Paul Cercueil
2018-07-24 13:38 [v3,11/18] dmaengine: dma-jz4780: Add missing residue DTC mask Vinod Koul
2018-07-24 13:38 ` [PATCH v3 11/18] " Vinod
2018-07-24 13:32 [v3,07/18] dmaengine: dma-jz4780: Add support for the JZ4770 SoC Vinod Koul
2018-07-24 13:32 ` [PATCH v3 07/18] " Vinod
2018-07-24 13:22 [v3,03/18] dmaengine: dma-jz4780: Avoid hardcoding number of channels Vinod Koul
2018-07-24 13:22 ` [PATCH v3 03/18] " Vinod
2018-07-21 15:10 [v3,13/18] dmaengine: dma-jz4780: Set DTCn register explicitly Randy Dunlap
2018-07-21 15:10 ` [PATCH v3 13/18] " Randy Dunlap
2018-07-21 11:06 [v3,18/18] MIPS: JZ4740: DTS: Add DMA nodes Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 18/18] " Paul Cercueil
2018-07-21 11:06 [v3,17/18] MIPS: JZ4770: " Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 17/18] " Paul Cercueil
2018-07-21 11:06 [v3,16/18] MIPS: JZ4780: DTS: Update DMA node to match driver changes Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 16/18] " Paul Cercueil
2018-07-21 11:06 [v3,15/18] dmaengine: dma-jz4780: Use dma_set_residue() Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 15/18] " Paul Cercueil
2018-07-21 11:06 [v3,14/18] dmaengine: dma-jz4780: Further residue status fix Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 14/18] " Paul Cercueil
2018-07-21 11:06 [v3,13/18] dmaengine: dma-jz4780: Set DTCn register explicitly Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 13/18] " Paul Cercueil
2018-07-21 11:06 [v3,11/18] dmaengine: dma-jz4780: Add missing residue DTC mask Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 11/18] " Paul Cercueil
2018-07-21 11:06 [v3,10/18] dmaengine: dma-jz4780: Enable Fast DMA to the AIC Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 10/18] " Paul Cercueil
2018-07-21 11:06 [v3,09/18] dmaengine: dma-jz4780: Add support for the JZ4725B SoC Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 09/18] " Paul Cercueil
2018-07-21 11:06 [v3,08/18] dmaengine: dma-jz4780: Add support for the JZ4740 SoC Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 08/18] " Paul Cercueil
2018-07-21 11:06 [v3,07/18] dmaengine: dma-jz4780: Add support for the JZ4770 SoC Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 07/18] " Paul Cercueil
2018-07-21 11:06 [v3,06/18] dmaengine: dma-jz4780: Don't depend on MACH_JZ4780 Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 06/18] " Paul Cercueil
2018-07-21 11:06 [v3,05/18] dmaengine: dma-jz4780: Use 4-word descriptors Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 05/18] " Paul Cercueil
2018-07-21 11:06 [v3,04/18] dmaengine: dma-jz4780: Separate chan/ctrl registers Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 04/18] " Paul Cercueil
2018-07-21 11:06 [v3,03/18] dmaengine: dma-jz4780: Avoid hardcoding number of channels Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 03/18] " Paul Cercueil
2018-07-21 11:06 [v3,02/18] dmaengine: dma-jz4780: Return error if not probed from DT Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 02/18] " Paul Cercueil
2018-07-21 11:06 [v3,01/18] doc: dt-bindings: jz4780-dma: Update bindings to reflect driver changes Paul Cercueil
2018-07-21 11:06 ` [PATCH v3 01/18] " Paul Cercueil
2018-07-21 11:06 [PATCH v3 00/18] JZ4780 DMA patchset v3 Paul Cercueil
2018-07-23 17:58 ` Paul Burton
2018-07-24 11:09   ` Paul Cercueil
2018-07-24 13:11     ` 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=20180721110643.19624-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.