summaryrefslogtreecommitdiffstats
path: root/drivers/dma/ti
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2019-07-30 16:20:15 +0300
committerVinod Koul <vkoul@kernel.org>2019-09-04 10:10:17 +0530
commit7a09c09c300761f2a0f34cfecebe327883de5864 (patch)
tree21aeb9fb53309a10f576955e98d1d1eb40ea2ecb /drivers/dma/ti
parente3b9fef8ddf8a5a31a16c4959202f5d88e07e080 (diff)
downloadlinux-7a09c09c300761f2a0f34cfecebe327883de5864.tar.bz2
dmaengine: ti: omap-dma: 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: 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>
Diffstat (limited to 'drivers/dma/ti')
-rw-r--r--drivers/dma/ti/omap-dma.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c
index d27779be5b17..23da592594fa 100644
--- a/drivers/dma/ti/omap-dma.c
+++ b/drivers/dma/ti/omap-dma.c
@@ -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: