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>

1 files changed, 2 insertions, 16 deletions

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 05e72bea9b07..7fbad56db7c9 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -189,21 +189,6 @@ static void put_tty_queue(unsigned char c, struct n_tty_data *ldata)
 }
 
 /**
- *      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 @@ do_it_again:
                  */
                 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)