From: Heena Sirwani <heenasirwani@gmail.com>
Date: Mon, 6 Oct 2014 06:29:29 +0000 (+0530)
Subject: Staging: comedi: drivers: Compressed two lines of code into one.
X-Git-Tag: firefly_0821_release~176^2~2665^2~1249
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ea0db9b2fd284104a9fd1cead85252a83375c71f;p=firefly-linux-kernel-4.4.55.git

Staging: comedi: drivers: Compressed two lines of code into one.

The following patch compresses two lines of code into one using
coccinelle and removes an unused variable.
The following semantic patch was used:

@@
expression ret;
identifier f;
@@

-ret =
+return
     f(...);
-return ret;

Signed-off-by: Heena Sirwani <heenasirwani@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/mite.c b/drivers/staging/comedi/drivers/mite.c
index 4f7829010a99..a43b5beffc4b 100644
--- a/drivers/staging/comedi/drivers/mite.c
+++ b/drivers/staging/comedi/drivers/mite.c
@@ -494,13 +494,10 @@ EXPORT_SYMBOL_GPL(mite_bytes_read_from_memory_ub);
 unsigned mite_dma_tcr(struct mite_channel *mite_chan)
 {
 	struct mite_struct *mite = mite_chan->mite;
-	int tcr;
 	int lkar;
 
 	lkar = readl(mite->mite_io_addr + MITE_LKAR(mite_chan->channel));
-	tcr = readl(mite->mite_io_addr + MITE_TCR(mite_chan->channel));
-
-	return tcr;
+	return readl(mite->mite_io_addr + MITE_TCR(mite_chan->channel));
 }
 EXPORT_SYMBOL_GPL(mite_dma_tcr);