Skip to content

Commit

Permalink
n_tty: Factor standard per-char i/o into separate fn
Browse files Browse the repository at this point in the history
Simplify __receive_buf() into a dispatch function; perform per-char
processing for all other modes not already handled.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Peter Hurley authored and Greg Kroah-Hartman committed Jul 24, 2013
1 parent 86e35ae commit 7d88d63
Showing 1 changed file with 17 additions and 10 deletions.
27 changes: 17 additions & 10 deletions drivers/tty/n_tty.c
Original file line number Diff line number Diff line change
Expand Up @@ -1569,6 +1569,22 @@ n_tty_receive_buf_closing(struct tty_struct *tty, const unsigned char *cp,
}
}

static void
n_tty_receive_buf_standard(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count)
{
char flag = TTY_NORMAL;

while (count--) {
if (fp)
flag = *fp++;
if (likely(flag == TTY_NORMAL))
n_tty_receive_char(tty, *cp++);
else
n_tty_receive_char_flagged(tty, *cp++, flag);
}
}

static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count)
{
Expand All @@ -1582,16 +1598,7 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
else if (tty->closing && !L_EXTPROC(tty))
n_tty_receive_buf_closing(tty, cp, fp, count);
else {
char flag = TTY_NORMAL;

while (count--) {
if (fp)
flag = *fp++;
if (likely(flag == TTY_NORMAL))
n_tty_receive_char(tty, *cp++);
else
n_tty_receive_char_flagged(tty, *cp++, flag);
}
n_tty_receive_buf_standard(tty, cp, fp, count);

flush_echoes(tty);
if (tty->ops->flush_chars)
Expand Down

0 comments on commit 7d88d63

Please sign in to comment.