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

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

n_tty: Move chars_in_buffer() to factor throttle/unthrottle 



Prepare to factor throttle and unthrottle into helper functions;
relocate chars_in_buffer() to avoid forward declaration.

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

drivers/tty/n_tty.c

+12 −12
Original line number Diff line number Diff line
@@ -202,6 +202,18 @@ static void n_tty_set_room(struct tty_struct *tty) 
	}

}



static ssize_t chars_in_buffer(struct tty_struct *tty)

{

	struct n_tty_data *ldata = tty->disc_data;

	ssize_t n = 0;



	if (!ldata->icanon)

		n = read_cnt(ldata);

	else

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

	return n;

}



/**

 *	put_tty_queue		-	add character to tty

 *	@c: character
@@ -285,18 +297,6 @@ static void n_tty_flush_buffer(struct tty_struct *tty) 
	up_write(&tty->termios_rwsem);

}



static ssize_t chars_in_buffer(struct tty_struct *tty)

{

	struct n_tty_data *ldata = tty->disc_data;

	ssize_t n = 0;



	if (!ldata->icanon)

		n = read_cnt(ldata);

	else

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

	return n;

}



/**

 *	n_tty_chars_in_buffer	-	report available bytes

 *	@tty: tty device