tty: add throttle/unthrottle helpers

Something Arjan suggested which allows us to clean up the code nicely

Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 20 insertions, 10 deletions

diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index abc93a93dcdd..19105ec203f7 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -147,10 +147,8 @@ static void put_tty_queue(unsigned char c, struct tty_struct *tty)
 
 static void check_unthrottle(struct tty_struct *tty)
 {
-        if (tty->count &&
-            test_and_clear_bit(TTY_THROTTLED, &tty->flags) &&
-            tty->ops->unthrottle)
-                tty->ops->unthrottle(tty);
+        if (tty->count)
+                tty_unthrottle(tty);
 }
 
 /**
@@ -982,12 +980,8 @@ static void n_tty_receive_buf(struct tty_struct *tty, const unsigned char *cp,
          * mode.  We don't want to throttle the driver if we're in
          * canonical mode and don't have a newline yet!
          */
-        if (tty->receive_room < TTY_THRESHOLD_THROTTLE) {
-                /* check TTY_THROTTLED first so it indicates our state */
-                if (!test_and_set_bit(TTY_THROTTLED, &tty->flags) &&
-                    tty->ops->throttle)
-                        tty->ops->throttle(tty);
-        }
+        if (tty->receive_room < TTY_THRESHOLD_THROTTLE)
+                tty_throttle(tty);
 }
 
 int is_ignored(int sig)
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index c10d40c4c5ca..b1a757a5ee27 100644
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -67,6 +67,22 @@ void tty_driver_flush_buffer(struct tty_struct *tty)
 
 EXPORT_SYMBOL(tty_driver_flush_buffer);
 
+void tty_throttle(struct tty_struct *tty)
+{
+        /* check TTY_THROTTLED first so it indicates our state */
+        if (!test_and_set_bit(TTY_THROTTLED, &tty->flags) &&
+            tty->ops->throttle)
+                tty->ops->throttle(tty);
+}
+EXPORT_SYMBOL(tty_throttle);
+
+void tty_unthrottle(struct tty_struct *tty)
+{
+        if (test_and_clear_bit(TTY_THROTTLED, &tty->flags) &&
+            tty->ops->unthrottle)
+                tty->ops->unthrottle(tty);
+}
+EXPORT_SYMBOL(tty_unthrottle);
 
 /**
  *      tty_wait_until_sent     -       wait for I/O to finish