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

Commit aac86703 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Vinod Koul
Browse files

dmaengine: ti: omap-dma: Readability cleanup in omap_dma_tx_status() 



The tx_status is most likely going to be asked for the current transfer, so
check that first then try to fall back to lookup of non started transfers.

In this way the code is a bit more readable and in most cases we will avoid
to run vchan_find_desc() all the time.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/20190716082459.1222-2-peter.ujfalusi@ti.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent f4c255f1

drivers/dma/ti/omap-dma.c

+6 −4
Original line number Diff line number Diff line
@@ -833,10 +833,8 @@ static enum dma_status omap_dma_tx_status(struct dma_chan *chan, 
		return ret;



	spin_lock_irqsave(&c->vc.lock, flags);

	vd = vchan_find_desc(&c->vc, cookie);

	if (vd) {

		txstate->residue = omap_dma_desc_size(to_omap_dma_desc(&vd->tx));

	} else if (c->desc && c->desc->vd.tx.cookie == cookie) {



	if (c->desc && c->desc->vd.tx.cookie == cookie) {

		struct omap_desc *d = c->desc;

		dma_addr_t pos;
@@ -848,11 +846,15 @@ static enum dma_status omap_dma_tx_status(struct dma_chan *chan, 
			pos = 0;



		txstate->residue = omap_dma_desc_size_pos(d, pos);

	} else if ((vd = vchan_find_desc(&c->vc, cookie))) {

		txstate->residue = omap_dma_desc_size(to_omap_dma_desc(&vd->tx));

	} else {

		txstate->residue = 0;

	}



	if (ret == DMA_IN_PROGRESS && c->paused)

		ret = DMA_PAUSED;



	spin_unlock_irqrestore(&c->vc.lock, flags);



	return ret;