From: Peter Hurley <peter@hurleysoftware.com>
Date: Fri, 27 Nov 2015 19:11:04 +0000 (-0500)
Subject: n_tty: Reduce branching in canon_copy_from_read_buf()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b985e9e368f0db4fee940ad86197f413779d4b63;p=linux-beck.git

n_tty: Reduce branching in canon_copy_from_read_buf()

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

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index bc613b868e71..f2f64252814f 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -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)