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>

3 files changed, 6 insertions, 5 deletions

diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 40084501c31b..7c7294590880 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -411,7 +411,8 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
                                 break;
 
                         case CTRLCHAR_CTRL:
-                                tty_insert_flip_char(tty, cchar, TTY_NORMAL);
+                                tty_insert_flip_char(&raw->port, cchar,
+                                                TTY_NORMAL);
                                 tty_flip_buffer_push(tty);
                                 break;
 
diff --git a/drivers/s390/char/keyboard.h b/drivers/s390/char/keyboard.h
index d0ae2be58191..acab28d4f06b 100644
--- a/drivers/s390/char/keyboard.h
+++ b/drivers/s390/char/keyboard.h
@@ -46,7 +46,7 @@ kbd_put_queue(struct tty_port *port, int ch)
         struct tty_struct *tty = tty_port_tty_get(port);
         if (!tty)
                 return;
-        tty_insert_flip_char(tty, ch, 0);
+        tty_insert_flip_char(port, ch, 0);
         tty_schedule_flip(tty);
         tty_kref_put(tty);
 }
@@ -58,7 +58,7 @@ kbd_puts_queue(struct tty_port *port, char *cp)
         if (!tty)
                 return;
         while (*cp)
-                tty_insert_flip_char(tty, *cp++, 0);
+                tty_insert_flip_char(port, *cp++, 0);
         tty_schedule_flip(tty);
         tty_kref_put(tty);
 }
diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c
index 877fbc37c1e7..c03863a7d455 100644
--- a/drivers/s390/char/sclp_tty.c
+++ b/drivers/s390/char/sclp_tty.c
@@ -342,7 +342,7 @@ sclp_tty_input(unsigned char* buf, unsigned int count)
         case CTRLCHAR_SYSRQ:
                 break;
         case CTRLCHAR_CTRL:
-                tty_insert_flip_char(tty, cchar, TTY_NORMAL);
+                tty_insert_flip_char(&sclp_port, cchar, TTY_NORMAL);
                 tty_flip_buffer_push(tty);
                 break;
         case CTRLCHAR_NONE:
@@ -352,7 +352,7 @@ sclp_tty_input(unsigned char* buf, unsigned int count)
                      strncmp((const char *) buf + count - 2, "\252n", 2))) {
                         /* add the auto \n */
                         tty_insert_flip_string(tty, buf, count);
-                        tty_insert_flip_char(tty, '\n', TTY_NORMAL);
+                        tty_insert_flip_char(&sclp_port, '\n', TTY_NORMAL);
                 } else
                         tty_insert_flip_string(tty, buf, count - 2);
                 tty_flip_buffer_push(tty);