aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2008-04-30 03:54:18 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 11:29:47 -0400
commit39c2e60f8c584c1b29b5c4375dd49df7995386bb (patch)
treefcb7e742d38c6e4655660d89be01e61d58ceebc4 /drivers/char
parent8cd64518a3d166a21f5c69ac7860b3add0369dd0 (diff)
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>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/n_tty.c14
-rw-r--r--drivers/char/tty_ioctl.c16
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)
147 147
148static void check_unthrottle(struct tty_struct *tty) 148static void check_unthrottle(struct tty_struct *tty)
149{ 149{
150 if (tty->count && 150 if (tty->count)
151 test_and_clear_bit(TTY_THROTTLED, &tty->flags) && 151 tty_unthrottle(tty);
152 tty->ops->unthrottle)
153 tty->ops->unthrottle(tty);
154} 152}
155 153
156/** 154/**
@@ -982,12 +980,8 @@ static void n_tty_receive_buf(struct tty_struct *tty, const unsigned char *cp,
982 * mode. We don't want to throttle the driver if we're in 980 * mode. We don't want to throttle the driver if we're in
983 * canonical mode and don't have a newline yet! 981 * canonical mode and don't have a newline yet!
984 */ 982 */
985 if (tty->receive_room < TTY_THRESHOLD_THROTTLE) { 983 if (tty->receive_room < TTY_THRESHOLD_THROTTLE)
986 /* check TTY_THROTTLED first so it indicates our state */ 984 tty_throttle(tty);
987 if (!test_and_set_bit(TTY_THROTTLED, &tty->flags) &&
988 tty->ops->throttle)
989 tty->ops->throttle(tty);
990 }
991} 985}
992 986
993int is_ignored(int sig) 987int 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)
67 67
68EXPORT_SYMBOL(tty_driver_flush_buffer); 68EXPORT_SYMBOL(tty_driver_flush_buffer);
69 69
70void tty_throttle(struct tty_struct *tty)
71{
72 /* check TTY_THROTTLED first so it indicates our state */
73 if (!test_and_set_bit(TTY_THROTTLED, &tty->flags) &&
74 tty->ops->throttle)
75 tty->ops->throttle(tty);
76}
77EXPORT_SYMBOL(tty_throttle);
78
79void tty_unthrottle(struct tty_struct *tty)
80{
81 if (test_and_clear_bit(TTY_THROTTLED, &tty->flags) &&
82 tty->ops->unthrottle)
83 tty->ops->unthrottle(tty);
84}
85EXPORT_SYMBOL(tty_unthrottle);
70 86
71/** 87/**
72 * tty_wait_until_sent - wait for I/O to finish 88 * tty_wait_until_sent - wait for I/O to finish