Commit 106d43f1 authored by Rehas Sachdeva's avatar Rehas Sachdeva Committed by Greg Kroah-Hartman
Browse files

staging: dgnc: Merge assignment with return 



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: default avatarRehas Sachdeva <aquannie@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dc0283c7

drivers/staging/dgnc/dgnc_tty.c

+5 −7
Original line number Diff line number Diff line
@@ -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,

		return put_user(C_CLOCAL(tty) ? 1 : 0,

				(unsigned long __user *)arg);

		return rc;



	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);

	}



	/*