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

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

dmaengine: ti: edma: Remove 'Assignment in if condition' 



While the compiler does not have problem with how it is implemented,
checkpatch does give en ERROR for this arrangement.

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


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

drivers/dma/ti/edma.c

+10 −5
Original line number Diff line number Diff line
@@ -1832,7 +1832,6 @@ static enum dma_status edma_tx_status(struct dma_chan *chan, 
				      struct dma_tx_state *txstate)

{

	struct edma_chan *echan = to_edma_chan(chan);

	struct virt_dma_desc *vdesc;

	struct dma_tx_state txstate_tmp;

	enum dma_status ret;

	unsigned long flags;
@@ -1846,12 +1845,18 @@ static enum dma_status edma_tx_status(struct dma_chan *chan, 
	if (!txstate)

		txstate = &txstate_tmp;



	txstate->residue = 0;

	spin_lock_irqsave(&echan->vchan.lock, flags);

	if (echan->edesc && echan->edesc->vdesc.tx.cookie == cookie)

	if (echan->edesc && echan->edesc->vdesc.tx.cookie == cookie) {

		txstate->residue = edma_residue(echan->edesc);

	else if ((vdesc = vchan_find_desc(&echan->vchan, cookie)))

	} else {

		struct virt_dma_desc *vdesc = vchan_find_desc(&echan->vchan,

							      cookie);



		if (vdesc)

			txstate->residue = to_edma_desc(&vdesc->tx)->residue;

		else

			txstate->residue = 0;

	}



	/*

	 * Mark the cookie completed if the residue is 0 for non cyclic