Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3c045df authored by Daniel Silsby's avatar Daniel Silsby Committed by Vinod Koul
Browse files

dmaengine: dma-jz4780: Simplify jz4780_dma_desc_residue() 



Simple cleanup, no changes to actual logic here.

Signed-off-by: default avatarDaniel Silsby <dansilsby@gmail.com>
Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Tested-by: default avatarMathieu Malaterre <malat@debian.org>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 5a6187d7

drivers/dma/dma-jz4780.c

+5 −10
Original line number Diff line number Diff line
@@ -610,22 +610,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 & GENMASK(23, 0)) <<

			jzchan->transfer_shift;

		count += desc->desc[i].dtc & GENMASK(23, 0);



	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,