[PATCH] Staging: dgnc: Merge lines and remove unused variable for immediate return

From: Shraddha Barke <shraddha.6596@gmail.com>
To: Lidza Louina <lidza.louina@gmail.com>
Cc: Mark Hounschell <markh@compro.net>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	driverdev-devel@linuxdriverproject.org,
	devel@driverdev.osuosl.org, Julia Lawall <julia.lawall@lip6.fr>,
	linux-kernel@vger.kernel.org,
	Shraddha Barke <shraddha.6596@gmail.com>
Subject: [PATCH] Staging: dgnc: Merge lines and remove unused variable for immediate return
Date: Mon, 27 Jul 2015 19:29:36 +0530	[thread overview]
Message-ID: <1438005576-6463-1-git-send-email-shraddha.6596@gmail.com> (raw)

This patch compresses two lines into a single line if immediate return
is found. Variable rc is dropped as it is no longer needed.

Semantic patch used for this is as follows:

@@
type T;
identifier i,f;
constant C;
@@
- T i;
  ...when != i
     when strict
(
  return -C;
|
- i =
+ return
     f(...);
- return i;
)

Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
---
 drivers/staging/dgnc/dgnc_neo.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/staging/dgnc/dgnc_neo.c b/drivers/staging/dgnc/dgnc_neo.c
index 900e3ae..321783c 100644
--- a/drivers/staging/dgnc/dgnc_neo.c
+++ b/drivers/staging/dgnc/dgnc_neo.c
@@ -1316,7 +1316,6 @@ static int neo_drain(struct tty_struct *tty, uint seconds)
 	unsigned long flags;
 	struct channel_t *ch;
 	struct un_t *un;
-	int rc = 0;
 
 	if (!tty || tty->magic != TTY_MAGIC)
 		return -ENXIO;
@@ -1339,10 +1338,7 @@ static int neo_drain(struct tty_struct *tty, uint seconds)
 	 *
 	 * NOTE: TODO: Do something with time passed in.
 	 */
-	rc = wait_event_interruptible(un->un_flags_wait, ((un->un_flags & UN_EMPTY) == 0));
-
-	/* If ret is non-zero, user ctrl-c'ed us */
-	return rc;
+	return wait_event_interruptible(un->un_flags_wait, ((un->un_flags & UN_EMPTY) == 0));
 }
 
 
-- 
2.1.0

