Staging:dgap :Compression of lines for immediate return
authorShraddha Barke <shraddha.6596@gmail.com>
Mon, 27 Jul 2015 18:00:52 +0000 (23:30 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 31 Jul 2015 23:14:53 +0000 (16:14 -0700)
This patch compresses two lines into a single line
if immediate return statement is found. Remove variable rc as
it is no longer needed.

It is done using script Coccinelle. And coccinelle uses the following
semantic patch for this compression function:

@@
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/dgap/dgap.c

index b344e035b0efb4993f958eb5275e212921b14fcf..9112dd2bf4d7757503ea1b53191d213dcbc93785 100644 (file)
@@ -4953,9 +4953,8 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
                spin_unlock_irqrestore(&bd->bd_lock, lock_flags);
 
-               rc = put_user(C_CLOCAL(tty) ? 1 : 0,
+               return put_user(C_CLOCAL(tty) ? 1 : 0,
                                (unsigned long __user *) arg);
-               return rc;
 
        case TIOCSSOFTCAR:
                spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);