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

n_tty: Inline check_unthrottle() at lone call site 



2-line function check_unthrottle() is now only called from
n_tty_read(); merge into caller.

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

drivers/tty/n_tty.c

+2 −16
Original line number Diff line number Diff line
@@ -188,21 +188,6 @@ static void put_tty_queue(unsigned char c, struct n_tty_data *ldata) 
	raw_spin_unlock_irqrestore(&ldata->read_lock, flags);

}



/**

 *	check_unthrottle	-	allow new receive data

 *	@tty; tty device

 *

 *	Check whether to call the driver unthrottle functions

 *

 *	Can sleep, may be called under the atomic_read_lock mutex but

 *	this is not guaranteed.

 */

static void check_unthrottle(struct tty_struct *tty)

{

	if (tty->count)

		tty_unthrottle(tty);

}



/**

 *	reset_buffer_flags	-	reset buffer state

 *	@tty: terminal to reset
@@ -1961,7 +1946,8 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file, 
		 */

		if (n_tty_chars_in_buffer(tty) <= TTY_THRESHOLD_UNTHROTTLE) {

			n_tty_set_room(tty);

			check_unthrottle(tty);

			if (tty->count)

				tty_unthrottle(tty);

		}



		if (b - buf >= minimum)