]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
dmaengine: ti: omap-dma: Remove 'Assignment in if condition'
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Tue, 30 Jul 2019 13:20:15 +0000 (16:20 +0300)
committerVinod Koul <vkoul@kernel.org>
Wed, 4 Sep 2019 04:40:17 +0000 (10:10 +0530)
While the compiler does not have problem with how it is implemented,
checkpatch does give en ERROR for this arrangement.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/20190730132015.2863-1-peter.ujfalusi@ti.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/ti/omap-dma.c

index d27779be5b173b587a2c6e85718217cf2b977adc..23da592594fa24dee9c147feb31c5733ba3e375b 100644 (file)
@@ -814,7 +814,6 @@ static enum dma_status omap_dma_tx_status(struct dma_chan *chan,
        dma_cookie_t cookie, struct dma_tx_state *txstate)
 {
        struct omap_chan *c = to_omap_dma_chan(chan);
-       struct virt_dma_desc *vd;
        enum dma_status ret;
        unsigned long flags;
        struct omap_desc *d = NULL;
@@ -841,10 +840,14 @@ 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;
+               struct virt_dma_desc *vd = vchan_find_desc(&c->vc, cookie);
+
+               if (vd)
+                       txstate->residue = omap_dma_desc_size(
+                                               to_omap_dma_desc(&vd->tx));
+               else
+                       txstate->residue = 0;
        }
 
 out: