linux-kernel - [PATCH 4/8] dmaengine: s3c24xx: Simplify code in s3c24xx_dma_tx

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1465321121-22238-5-git-send-email-peter.griffin@linaro.org>
Date:	Tue,  7 Jun 2016 18:38:37 +0100
From:	Peter Griffin <peter.griffin@...aro.org>
To:	linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
	kernel@...inux.com, vinod.koul@...el.com, linus.walleij@...aro.org,
	dan.j.williams@...el.com, leoli@...escale.com, zw@...kernel.org,
	baohua@...nel.org, maxime.ripard@...e-electrons.com, wens@...e.org,
	ldewangan@...dia.com, jonathanh@...dia.com, swarren@...dotorg.org,
	thierry.reding@...il.com, gnurou@...il.com
Cc:	peter.griffin@...aro.org, lee.jones@...aro.org,
	dmaengine@...r.kernel.org, linux-tegra@...r.kernel.org,
	linuxppc-dev@...ts.ozlabs.org
Subject: [PATCH 4/8] 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@...aro.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