diff options
| author | Jiri Slaby | 2013-01-03 15:53:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-01-15 22:22:35 -0800 |
| commit | 05c7cd39907184328f48d3e7899f9cdd653ad336 (patch) | |
| tree | 9d1ed5c757426aa20b7eccd853faa6b519a4aa7b /drivers/s390/char | |
| parent | 92a19f9cec9a80ad93c06e115822deb729e2c6ad (diff) | |
TTY: switch tty_insert_flip_string
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_string this time.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/s390/char')
| -rw-r--r-- | drivers/s390/char/con3215.c | 3 | ||||
| -rw-r--r-- | drivers/s390/char/sclp_tty.c | 4 | ||||
| -rw-r--r-- | drivers/s390/char/sclp_vt220.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index 7c7294590880..4c6743dd5357 100644 --- a/drivers/s390/char/con3215.c +++ b/drivers/s390/char/con3215.c @@ -425,7 +425,8 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm, count++; } else count -= 2; - tty_insert_flip_string(tty, raw->inbuf, count); + tty_insert_flip_string(&raw->port, raw->inbuf, + count); tty_flip_buffer_push(tty); break; } diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c index c03863a7d455..3ffddbb53d2f 100644 --- a/drivers/s390/char/sclp_tty.c +++ b/drivers/s390/char/sclp_tty.c @@ -351,10 +351,10 @@ sclp_tty_input(unsigned char* buf, unsigned int count) (strncmp((const char *) buf + count - 2, "^n", 2) && strncmp((const char *) buf + count - 2, "\252n", 2))) { /* add the auto \n */ - tty_insert_flip_string(tty, buf, count); + tty_insert_flip_string(&sclp_port, buf, count); tty_insert_flip_char(&sclp_port, '\n', TTY_NORMAL); } else - tty_insert_flip_string(tty, buf, count - 2); + tty_insert_flip_string(&sclp_port, buf, count - 2); tty_flip_buffer_push(tty); break; } diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c index effcc8756e0a..b5507f199b24 100644 --- a/drivers/s390/char/sclp_vt220.c +++ b/drivers/s390/char/sclp_vt220.c @@ -480,7 +480,7 @@ sclp_vt220_receiver_fn(struct evbuf_header *evbuf) /* Send input to line discipline */ buffer++; count--; - tty_insert_flip_string(tty, buffer, count); + tty_insert_flip_string(&sclp_vt220_port, buffer, count); tty_flip_buffer_push(tty); break; } |