mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
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: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
afa80ccb4c
commit
c828f679ee
1 changed files with 2 additions and 16 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue