summaryrefslogtreecommitdiff
path: root/drivers/tty/vt
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2013-01-03 15:53:03 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-15 22:21:36 -0800
commit92a19f9cec9a80ad93c06e115822deb729e2c6ad (patch)
tree80e1550ac1647a1cdf20a0b568554c0c50a63f75 /drivers/tty/vt
parent2f69335710884ae6112fc8196ebe29b5cda7b79b (diff)
downloadlinux-3.10-92a19f9cec9a80ad93c06e115822deb729e2c6ad.tar.gz
linux-3.10-92a19f9cec9a80ad93c06e115822deb729e2c6ad.tar.bz2
linux-3.10-92a19f9cec9a80ad93c06e115822deb729e2c6ad.zip
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 'drivers/tty/vt')
-rw-r--r--drivers/tty/vt/keyboard.c6
-rw-r--r--drivers/tty/vt/vt.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index 681765baef6..5aace4d47cb 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -309,8 +309,8 @@ static void put_queue(struct vc_data *vc, int ch)
{
struct tty_struct *tty = vc->port.tty;
+ tty_insert_flip_char(&vc->port, ch, 0);
if (tty) {
- tty_insert_flip_char(tty, ch, 0);
tty_schedule_flip(tty);
}
}
@@ -323,7 +323,7 @@ static void puts_queue(struct vc_data *vc, char *cp)
return;
while (*cp) {
- tty_insert_flip_char(tty, *cp, 0);
+ tty_insert_flip_char(&vc->port, *cp, 0);
cp++;
}
tty_schedule_flip(tty);
@@ -586,7 +586,7 @@ static void fn_send_intr(struct vc_data *vc)
if (!tty)
return;
- tty_insert_flip_char(tty, 0, TTY_BREAK);
+ tty_insert_flip_char(&vc->port, 0, TTY_BREAK);
tty_schedule_flip(tty);
}
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 8fd89687d06..811f2505e9e 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -1336,7 +1336,7 @@ static void csi_m(struct vc_data *vc)
static void respond_string(const char *p, struct tty_struct *tty)
{
while (*p) {
- tty_insert_flip_char(tty, *p, 0);
+ tty_insert_flip_char(tty->port, *p, 0);
p++;
}
tty_schedule_flip(tty);