[PATCH v2 4/7] staging: mt7621-dma: Remove assignment in if

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Fixes checkpatch error: ASSIGN_IN_IF by adding an inner if in the else
path, this also avoids calling vchan_find_desc when not needed.

Signed-off-by: Christian Lütke-Stetzkamp <christian@xxxxxxxx>
---
 drivers/staging/mt7621-dma/ralink-gdma.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/mt7621-dma/ralink-gdma.c b/drivers/staging/mt7621-dma/ralink-gdma.c
index 9548ce4afb77..5646a09dd8c9 100644
--- a/drivers/staging/mt7621-dma/ralink-gdma.c
+++ b/drivers/staging/mt7621-dma/ralink-gdma.c
@@ -689,8 +689,11 @@ static enum dma_status gdma_dma_tx_status(struct dma_chan *c,
 				((chan->next_sg - 1) * desc->sg[0].len);
 		else
 			state->residue = desc->residue;
-	} else if ((vdesc = vchan_find_desc(&chan->vchan, cookie)))
-		state->residue = to_gdma_dma_desc(vdesc)->residue;
+	} else {
+		vdesc = vchan_find_desc(&chan->vchan, cookie);
+		if (vdesc)
+			state->residue = to_gdma_dma_desc(vdesc)->residue;
+	}
 	spin_unlock_irqrestore(&chan->vchan.lock, flags);
 
 	dev_dbg(c->device->dev, "tx residue %d bytes\n", state->residue);
-- 
2.13.6

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel




[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux