From: Peter Griffin <peter.griffin@linaro.org>
Date: Tue, 7 Jun 2016 17:38:37 +0000 (+0100)
Subject: dmaengine: s3c24xx: Simplify code in s3c24xx_dma_tx_status()
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e841b80f450ba788c4855af5cc4c535ed9ab7e47;p=openwrt%2Fstaging%2Fblogic.git

dmaengine: s3c24xx: Simplify code in s3c24xx_dma_tx_status()

Doing so saves a few lines of code in the driver.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---

diff --git a/drivers/dma/s3c24xx-dma.c b/drivers/dma/s3c24xx-dma.c
index 17ccdfd28f37..f7d2c7a00496 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;
 	}