staging: dgnc: Merge assignment with return
authorRehas Sachdeva <aquannie@gmail.com>
Tue, 20 Sep 2016 07:46:37 +0000 (13:16 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Sep 2016 11:41:51 +0000 (13:41 +0200)
Instead of storing the return value of a function call into a variable and
then returning it, we can club the two into a single return statement. This
change was made using the following semantic patch by Coccinelle:

@@
local idexpression ret;
expression e;
@@

-ret =
+return
     e;
-return ret;

Signed-off-by: Rehas Sachdeva <aquannie@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/dgnc/dgnc_tty.c

index fd46ef0..1c1ac84 100644 (file)
@@ -2548,9 +2548,8 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
 
                spin_unlock_irqrestore(&ch->ch_lock, flags);
 
-               rc = put_user(C_CLOCAL(tty) ? 1 : 0,
-                             (unsigned long __user *)arg);
-               return rc;
+               return put_user(C_CLOCAL(tty) ? 1 : 0,
+                               (unsigned long __user *)arg);
 
        case TIOCSSOFTCAR:
 
@@ -2721,8 +2720,8 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
 
        case DIGI_GETCUSTOMBAUD:
                spin_unlock_irqrestore(&ch->ch_lock, flags);
-               rc = put_user(ch->ch_custom_speed, (unsigned int __user *)arg);
-               return rc;
+               return put_user(ch->ch_custom_speed,
+                               (unsigned int __user *)arg);
 
        case DIGI_SETCUSTOMBAUD:
        {
@@ -2808,8 +2807,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                        events |= (EV_IPU | EV_IPS);
 
                spin_unlock_irqrestore(&ch->ch_lock, flags);
-               rc = put_user(events, (unsigned int __user *)arg);
-               return rc;
+               return put_user(events, (unsigned int __user *)arg);
        }
 
        /*