From 9a4aec2dd5b54606b3508e0e064750f516009650 Mon Sep 17 00:00:00 2001 From: Peter Hurley Date: Sat, 15 Jun 2013 09:14:32 -0400 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/tty/n_tty.c | 24 ++++++++++++------------ 1 file 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 -- 2.20.1