aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/tty_flip.h
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2013-01-03 09:53:03 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-16 01:21:36 -0500
commit92a19f9cec9a80ad93c06e115822deb729e2c6ad (patch)
tree80e1550ac1647a1cdf20a0b568554c0c50a63f75 /include/linux/tty_flip.h
parent2f69335710884ae6112fc8196ebe29b5cda7b79b (diff)
TTY: switch tty_insert_flip_char
Now, we start converting tty buffer functions to actually use tty_port. This will allow us to get rid of the need of tty in many call sites. Only tty_port will needed and hence no more tty_port_tty_get in those paths. tty_insert_flip_char is the next one to proceed. This one is used all over the code, so the patch is huge. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/tty_flip.h')
-rw-r--r--include/linux/tty_flip.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/tty_flip.h b/include/linux/tty_flip.h
index 743f1d076467..f9acb578c6ad 100644
--- a/include/linux/tty_flip.h
+++ b/include/linux/tty_flip.h
@@ -12,16 +12,16 @@ extern int tty_prepare_flip_string_flags(struct tty_port *port,
12 unsigned char **chars, char **flags, size_t size); 12 unsigned char **chars, char **flags, size_t size);
13void tty_schedule_flip(struct tty_struct *tty); 13void tty_schedule_flip(struct tty_struct *tty);
14 14
15static inline int tty_insert_flip_char(struct tty_struct *tty, 15static inline int tty_insert_flip_char(struct tty_port *port,
16 unsigned char ch, char flag) 16 unsigned char ch, char flag)
17{ 17{
18 struct tty_buffer *tb = tty->port->buf.tail; 18 struct tty_buffer *tb = port->buf.tail;
19 if (tb && tb->used < tb->size) { 19 if (tb && tb->used < tb->size) {
20 tb->flag_buf_ptr[tb->used] = flag; 20 tb->flag_buf_ptr[tb->used] = flag;
21 tb->char_buf_ptr[tb->used++] = ch; 21 tb->char_buf_ptr[tb->used++] = ch;
22 return 1; 22 return 1;
23 } 23 }
24 return tty_insert_flip_string_flags(tty->port, &ch, &flag, 1); 24 return tty_insert_flip_string_flags(port, &ch, &flag, 1);
25} 25}
26 26
27static inline int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars, size_t size) 27static inline int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars, size_t size)