[PATCH v4 20/24] n_tty: Move chars_in_buffer() to factor throttle/unthrottle

From: Peter Hurley
Date: Sat Jun 15 2013 - 09:21:49 EST


Prepare to factor throttle and unthrottle into helper functions;
relocate chars_in_buffer() to avoid forward declaration.

Signed-off-by: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
---
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 b78ee464..9ec0c68 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
--
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/