n_tty: drop parmrk_dbl from n_tty_receive_char
authorJiri Slaby <jslaby@suse.cz>
Wed, 5 May 2021 09:18:58 +0000 (11:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 May 2021 14:57:15 +0000 (16:57 +0200)
After the previous cleanup patches, parmrk_dbl parameter is always true
-- I_PARMRK is checked only in n_tty_receive_char now. So remove
parmrk_dbl completely.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210505091928.22010-6-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/n_tty.c

index 5d83fb5412fd55130d9412682c2ebb06e8782f2e..f0db3f41df83a0d3168da772fc0e607875f3938c 100644 (file)
@@ -1400,8 +1400,7 @@ handle_newline:
        return 0;
 }
 
-static void n_tty_receive_char(struct tty_struct *tty, unsigned char c,
-               bool parmrk_dbl)
+static void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
 {
        struct n_tty_data *ldata = tty->disc_data;
 
@@ -1418,7 +1417,7 @@ static void n_tty_receive_char(struct tty_struct *tty, unsigned char c,
                commit_echoes(tty);
        }
        /* PARMRK doubling check */
-       if (parmrk_dbl && c == (unsigned char) '\377' && I_PARMRK(tty))
+       if (c == (unsigned char) '\377' && I_PARMRK(tty))
                put_tty_queue(c, ldata);
        put_tty_queue(c, ldata);
 }
@@ -1474,7 +1473,7 @@ n_tty_receive_char_lnext(struct tty_struct *tty, unsigned char c, char flag)
                        c &= 0x7f;
                if (I_IUCLC(tty) && L_IEXTEN(tty))
                        c = tolower(c);
-               n_tty_receive_char(tty, c, true);
+               n_tty_receive_char(tty, c);
        } else
                n_tty_receive_char_flagged(tty, c, flag);
 }
@@ -1551,7 +1550,7 @@ static void n_tty_receive_buf_standard(struct tty_struct *tty,
                                continue;
                        }
                        if (!test_bit(c, ldata->char_map))
-                               n_tty_receive_char(tty, c, true);
+                               n_tty_receive_char(tty, c);
                        else if (n_tty_receive_char_special(tty, c) && count) {
                                if (fp)
                                        flag = *fp++;