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

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

n_tty: Reduce branching in canon_copy_from_read_buf() 



Instead of compare-and-set, just compute 'found'.

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

drivers/tty/n_tty.c

+3 −4
Original line number Diff line number Diff line
@@ -2080,10 +2080,9 @@ static int canon_copy_from_read_buf(struct tty_struct *tty, 
	if (eol == N_TTY_BUF_SIZE && more) {

		/* scan wrapped without finding set bit */

		eol = find_next_bit(ldata->read_flags, more, 0);

		if (eol != more)

			found = 1;

	} else if (eol != size)

		found = 1;

		found = eol != more;

	} else

		found = eol != size;



	n = eol - tail;

	if (n > N_TTY_BUF_SIZE)