diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2013-06-15 15:14:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-24 01:43:02 +0200 |
| commit | 9a4aec2dd5b54606b3508e0e064750f516009650 (patch) | |
| tree | c35f7f64f6621ae2aa85982a2373bce71e55b673 | |
| parent | tty: Only guarantee termios read safety for throttle/unthrottle (diff) | |
| download | linux-9a4aec2dd5b54606b3508e0e064750f516009650.tar.xz linux-9a4aec2dd5b54606b3508e0e064750f516009650.zip | |
n_tty: Move chars_in_buffer() to factor throttle/unthrottle
Prepare to factor throttle and unthrottle into helper functions;
relocate chars_in_buffer() to avoid forward declaration.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/n_tty.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index b78ee464bd09..9ec0c68aa739 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c @@ -202,6 +202,18 @@ static void n_tty_set_room(struct tty_struct *tty) } } +static ssize_t chars_in_buffer(struct tty_struct *tty) +{ + struct n_tty_data *ldata = tty->disc_data; + ssize_t n = 0; + + if (!ldata->icanon) + n = read_cnt(ldata); + else + n = ldata->canon_head - ldata->read_tail; + return n; +} + /** * put_tty_queue - add character to tty * @c: character @@ -285,18 +297,6 @@ static void n_tty_flush_buffer(struct tty_struct *tty) up_write(&tty->termios_rwsem); } -static ssize_t chars_in_buffer(struct tty_struct *tty) -{ - struct n_tty_data *ldata = tty->disc_data; - ssize_t n = 0; - - if (!ldata->icanon) - n = read_cnt(ldata); - else - n = ldata->canon_head - ldata->read_tail; - return n; -} - /** * n_tty_chars_in_buffer - report available bytes * @tty: tty device |