Commit d88c3c26 authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman
Browse files

tty: n_tty: simplify chars_in_buffer() 



The 'if' in chars_in_buffer() is misleadingly inverted. And since the
only difference is the head used for computation, cache the head using
ternary operator. And use that in return directly.

Signed-off-by: default avatar"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230827074147.2287-11-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 046b44ab

drivers/tty/n_tty.c

+2 −6
Original line number Diff line number Diff line
@@ -219,13 +219,9 @@ static void n_tty_kick_worker(const struct tty_struct *tty) 
static ssize_t chars_in_buffer(const struct tty_struct *tty)

{

	const struct n_tty_data *ldata = tty->disc_data;

	ssize_t n = 0;

	size_t head = ldata->icanon ? ldata->canon_head : ldata->commit_head;



	if (!ldata->icanon)

		n = ldata->commit_head - ldata->read_tail;

	else

		n = ldata->canon_head - ldata->read_tail;

	return n;

	return head - ldata->read_tail;

}



/**