diff options
| author |   Christian Lütke-Stetzkamp <christian@lkamp.de> | 2018-03-21 23:25:35 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-23 16:00:17 +0100 |
| commit | c48f6ac12cb5233ce767fdff5d92be551f194d61 (patch) | |
| tree | ad9064e783617fcc5867d271eb6f7f68465c78b5 /drivers/staging/mt7621-dma | |
| parent | staging: mt7621-dma: Fix open brace position (diff) | |
| download | linux-dev-c48f6ac12cb5233ce767fdff5d92be551f194d61.tar.xz linux-dev-c48f6ac12cb5233ce767fdff5d92be551f194d61.zip | |
staging: mt7621-dma: Remove assignment in if
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@lkamp.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/mt7621-dma')
| -rw-r--r-- | drivers/staging/mt7621-dma/ralink-gdma.c | 7 |
1 files 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); |