[PATCH 4/8] dmaengine: s3c24xx: Simplify code in s3c24xx_dma_tx_status()
From: Peter Griffin <peter.griffin@linaro.org>
Date: 2016-06-07 17:42:17
Also in:
linux-arm-kernel, linuxppc-dev, lkml
Subsystem:
arm/samsung s3c, s5p and exynos arm architectures, dma generic offload engine subsystem, the rest · Maintainers:
Krzysztof Kozlowski, Vinod Koul, Linus Torvalds
Doing so saves a few lines of code in the driver. Signed-off-by: Peter Griffin <peter.griffin@linaro.org> --- drivers/dma/s3c24xx-dma.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/dma/s3c24xx-dma.c b/drivers/dma/s3c24xx-dma.c
index 17ccdfd..f7d2c7a 100644
--- a/drivers/dma/s3c24xx-dma.c
+++ b/drivers/dma/s3c24xx-dma.c@@ -768,16 +768,12 @@ static enum dma_status s3c24xx_dma_tx_status(struct dma_chan *chan, spin_lock_irqsave(&s3cchan->vc.lock, flags); ret = dma_cookie_status(chan, cookie, txstate); - if (ret == DMA_COMPLETE) { - spin_unlock_irqrestore(&s3cchan->vc.lock, flags); - return ret; - } /* * There's no point calculating the residue if there's * no txstate to store the value. */ - if (!txstate) { + if (ret == DMA_COMPLETE || !txstate) { spin_unlock_irqrestore(&s3cchan->vc.lock, flags); return ret; }
--
1.9.1