TTY: switch tty_flip_buffer_push

[firefly-linux-kernel-4.4.55.git] / drivers / s390 / char / con3215.c

diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 40084501c31b7a28d2a436353a16e906c5d3640f..2f58e9fde156297b06dae7f6e6badd977d765603 100644 (file)
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -411,8 +411,9 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
                                break;
 
                        case CTRLCHAR_CTRL:
-                               tty_insert_flip_char(tty, cchar, TTY_NORMAL);
-                               tty_flip_buffer_push(tty);
+                               tty_insert_flip_char(&raw->port, cchar,
+                                               TTY_NORMAL);
+                               tty_flip_buffer_push(&raw->port);
                                break;
 
                        case CTRLCHAR_NONE:
@@ -424,8 +425,9 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
                                        count++;
                                } else
                                        count -= 2;
-                               tty_insert_flip_string(tty, raw->inbuf, count);
-                               tty_flip_buffer_push(tty);
+                               tty_insert_flip_string(&raw->port, raw->inbuf,
+                                               count);
+                               tty_flip_buffer_push(&raw->port);
                                break;
                        }
                } else if (req->type == RAW3215_WRITE) {
@@ -966,7 +968,7 @@ static int tty3215_open(struct tty_struct *tty, struct file * filp)
 
        tty_port_tty_set(&raw->port, tty);
 
-       tty->low_latency = 0;  /* don't use bottom half for pushing chars */
+       raw->port.low_latency = 0; /* don't use bottom half for pushing chars */
        /*
         * Start up 3215 device
         */