diff options
author | Daniel Silsby <dansilsby@gmail.com> | 2018-08-29 17:32:54 -0400 |
---|---|---|
committer | Vinod Koul <vkoul@kernel.org> | 2018-09-11 03:29:26 -0400 |
commit | f3c045dffe738fb2de534a8156f540dff42c315e (patch) | |
tree | 13e096af6c20fdccbe39ae0070f6108bd41778ad | |
parent | 5a6187d70f7fc0b55db49af4b2a0f35f34efd770 (diff) |
dmaengine: dma-jz4780: Simplify jz4780_dma_desc_residue()
Simple cleanup, no changes to actual logic here.
Signed-off-by: Daniel Silsby <dansilsby@gmail.com>
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Tested-by: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
-rw-r--r-- | drivers/dma/dma-jz4780.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c index bd3cecb800c5..d055602a92ca 100644 --- a/drivers/dma/dma-jz4780.c +++ b/drivers/dma/dma-jz4780.c | |||
@@ -610,22 +610,17 @@ static size_t jz4780_dma_desc_residue(struct jz4780_dma_chan *jzchan, | |||
610 | struct jz4780_dma_desc *desc, unsigned int next_sg) | 610 | struct jz4780_dma_desc *desc, unsigned int next_sg) |
611 | { | 611 | { |
612 | struct jz4780_dma_dev *jzdma = jz4780_dma_chan_parent(jzchan); | 612 | struct jz4780_dma_dev *jzdma = jz4780_dma_chan_parent(jzchan); |
613 | unsigned int residue, count; | 613 | unsigned int count = 0; |
614 | unsigned int i; | 614 | unsigned int i; |
615 | 615 | ||
616 | residue = 0; | ||
617 | |||
618 | for (i = next_sg; i < desc->count; i++) | 616 | for (i = next_sg; i < desc->count; i++) |
619 | residue += (desc->desc[i].dtc & GENMASK(23, 0)) << | 617 | count += desc->desc[i].dtc & GENMASK(23, 0); |
620 | jzchan->transfer_shift; | ||
621 | 618 | ||
622 | if (next_sg != 0) { | 619 | if (next_sg != 0) |
623 | count = jz4780_dma_chn_readl(jzdma, jzchan->id, | 620 | count += jz4780_dma_chn_readl(jzdma, jzchan->id, |
624 | JZ_DMA_REG_DTC); | 621 | JZ_DMA_REG_DTC); |
625 | residue += count << jzchan->transfer_shift; | ||
626 | } | ||
627 | 622 | ||
628 | return residue; | 623 | return count << jzchan->transfer_shift; |
629 | } | 624 | } |
630 | 625 | ||
631 | static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan, | 626 | static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan, |