Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-19 10:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Staging: dgnc: Compress two lines of code into one.

Browse Source 
The following patch merges two lines of code into one using coccinelle
and removes unused variables. The semantic patch used is as follows:

@@
expression ret;
identifier f;
@@

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

Signed-off-by: Heena Sirwani <heenasirwani@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Heena Sirwani 2014-10-06 10:19:09 +05:30 committed by Greg Kroah-Hartman
parent 2ff6179f16
commit ca5dd0b83d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/dgnc/dgnc_cls.c
View File

@ -964,7 +964,6 @@ static int cls_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;
@ -984,12 +983,11 @@ static int cls_drain(struct tty_struct *tty, uint seconds)
/*
* NOTE: 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));
}