Browse Source

n_tty: Remove unnecessary local variable

Flatten conditional evaluation in n_tty_set_termios; remove
canon_change.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Peter Hurley 12 years ago
parent
commit
c786f74e0b
1 changed files with 1 additions and 4 deletions
  1. 1 4
      drivers/tty/n_tty.c

+ 1 - 4
drivers/tty/n_tty.c

@@ -1752,11 +1752,8 @@ int is_ignored(int sig)
 static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
 static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
 {
 {
 	struct n_tty_data *ldata = tty->disc_data;
 	struct n_tty_data *ldata = tty->disc_data;
-	int canon_change = 1;
 
 
-	if (old)
-		canon_change = (old->c_lflag ^ tty->termios.c_lflag) & ICANON;
-	if (canon_change) {
+	if (!old || (old->c_lflag ^ tty->termios.c_lflag) & ICANON) {
 		bitmap_zero(ldata->read_flags, N_TTY_BUF_SIZE);
 		bitmap_zero(ldata->read_flags, N_TTY_BUF_SIZE);
 		ldata->line_start = 0;
 		ldata->line_start = 0;
 		ldata->canon_head = ldata->read_tail;
 		ldata->canon_head = ldata->read_tail;