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>

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 41c0c80094a5..5372bf0e74ab 100644
--- a/drivers/tty/n_tty.c
+++ b/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)
 {
         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);
                 ldata->line_start = 0;
                 ldata->canon_head = ldata->read_tail;