Commit ae677517 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

tty: Clean up tiocmset 



Reverse the order of one test and it gets much more readable

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8fb06c77

drivers/char/tty_io.c

+22 −26
Original line number Diff line number Diff line
@@ -3515,15 +3515,15 @@ static int tty_tiocmget(struct tty_struct *tty, struct file *file, int __user *p 
static int tty_tiocmset(struct tty_struct *tty, struct file *file, unsigned int cmd,

	     unsigned __user *p)

{

	int retval = -EINVAL;



	if (tty->ops->tiocmset) {

	int retval;

	unsigned int set, clear, val;



	if (tty->ops->tiocmset == NULL)

		return -EINVAL;



	retval = get_user(val, p);

	if (retval)

		return retval;



	set = clear = 0;

	switch (cmd) {

	case TIOCMBIS:
@@ -3537,13 +3537,9 @@ static int tty_tiocmset(struct tty_struct *tty, struct file *file, unsigned int 
		clear = ~val;

		break;

	}



	set &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;

	clear &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;



		retval = tty->ops->tiocmset(tty, file, set, clear);

	}

	return retval;

	return tty->ops->tiocmset(tty, file, set, clear);

}



/*