Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d88d637 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

n_tty: Factor standard per-char i/o into separate fn 



Simplify __receive_buf() into a dispatch function; perform per-char
processing for all other modes not already handled.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 86e35aea

drivers/tty/n_tty.c

+17 −10
Original line number Diff line number Diff line
@@ -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)

{
@@ -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)