Skip to content

Commit

Permalink
n_tty: drop parmrk_dbl from n_tty_receive_char
Browse files Browse the repository at this point in the history
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 <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
Jiri Slaby authored and gregkh committed May 13, 2021
1 parent 1ed2dfe commit 95aafe3
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/tty/n_tty.c
Original file line number Diff line number Diff line change
Expand Up @@ -1400,8 +1400,7 @@ n_tty_receive_char_special(struct tty_struct *tty, unsigned char c)
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;

Expand All @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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++;
Expand Down

0 comments on commit 95aafe3

Please sign in to comment.