diff options
| author | Peter Hurley | 2015-11-27 14:11:04 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-12-13 19:59:48 -0800 |
| commit | b985e9e368f0db4fee940ad86197f413779d4b63 (patch) | |
| tree | 45922ca0c6e3d0f3d1519516075280aa977b3119 /drivers/tty | |
| parent | e661cf702003030daf2001cb88eb586300a18ee4 (diff) | |
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>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/n_tty.c | 7 |
1 files changed, 3 insertions, 4 deletions
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) |