Commit 95aafe32 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

n_tty: drop parmrk_dbl from n_tty_receive_char

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: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210505091928.22010-6-jslaby@suse.czSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ed2dfed
...@@ -1400,8 +1400,7 @@ n_tty_receive_char_special(struct tty_struct *tty, unsigned char c) ...@@ -1400,8 +1400,7 @@ n_tty_receive_char_special(struct tty_struct *tty, unsigned char c)
return 0; return 0;
} }
static void n_tty_receive_char(struct tty_struct *tty, unsigned char c, static void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
bool parmrk_dbl)
{ {
struct n_tty_data *ldata = tty->disc_data; 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, ...@@ -1418,7 +1417,7 @@ static void n_tty_receive_char(struct tty_struct *tty, unsigned char c,
commit_echoes(tty); commit_echoes(tty);
} }
/* PARMRK doubling check */ /* 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);
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) ...@@ -1474,7 +1473,7 @@ n_tty_receive_char_lnext(struct tty_struct *tty, unsigned char c, char flag)
c &= 0x7f; c &= 0x7f;
if (I_IUCLC(tty) && L_IEXTEN(tty)) if (I_IUCLC(tty) && L_IEXTEN(tty))
c = tolower(c); c = tolower(c);
n_tty_receive_char(tty, c, true); n_tty_receive_char(tty, c);
} else } else
n_tty_receive_char_flagged(tty, c, flag); n_tty_receive_char_flagged(tty, c, flag);
} }
...@@ -1551,7 +1550,7 @@ static void n_tty_receive_buf_standard(struct tty_struct *tty, ...@@ -1551,7 +1550,7 @@ static void n_tty_receive_buf_standard(struct tty_struct *tty,
continue; continue;
} }
if (!test_bit(c, ldata->char_map)) 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) { else if (n_tty_receive_char_special(tty, c) && count) {
if (fp) if (fp)
flag = *fp++; flag = *fp++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment