Commit 20acdfa8 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

TTY: tty3270, push tty down to tty3270_do_write

So that we do not need to access tp->tty there. It is going away.
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux390@de.ibm.com
Cc: linux-s390@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 881e18f9
...@@ -1509,12 +1509,13 @@ tty3270_escape_sequence(struct tty3270 *tp, char ch) ...@@ -1509,12 +1509,13 @@ tty3270_escape_sequence(struct tty3270 *tp, char ch)
* String write routine for 3270 ttys * String write routine for 3270 ttys
*/ */
static void static void
tty3270_do_write(struct tty3270 *tp, const unsigned char *buf, int count) tty3270_do_write(struct tty3270 *tp, struct tty_struct *tty,
const unsigned char *buf, int count)
{ {
int i_msg, i; int i_msg, i;
spin_lock_bh(&tp->view.lock); spin_lock_bh(&tp->view.lock);
for (i_msg = 0; !tp->tty->stopped && i_msg < count; i_msg++) { for (i_msg = 0; !tty->stopped && i_msg < count; i_msg++) {
if (tp->esc_state != 0) { if (tp->esc_state != 0) {
/* Continue escape sequence. */ /* Continue escape sequence. */
tty3270_escape_sequence(tp, buf[i_msg]); tty3270_escape_sequence(tp, buf[i_msg]);
...@@ -1591,10 +1592,10 @@ tty3270_write(struct tty_struct * tty, ...@@ -1591,10 +1592,10 @@ tty3270_write(struct tty_struct * tty,
if (!tp) if (!tp)
return 0; return 0;
if (tp->char_count > 0) { if (tp->char_count > 0) {
tty3270_do_write(tp, tp->char_buf, tp->char_count); tty3270_do_write(tp, tty, tp->char_buf, tp->char_count);
tp->char_count = 0; tp->char_count = 0;
} }
tty3270_do_write(tp, buf, count); tty3270_do_write(tp, tty, buf, count);
return count; return count;
} }
...@@ -1625,7 +1626,7 @@ tty3270_flush_chars(struct tty_struct *tty) ...@@ -1625,7 +1626,7 @@ tty3270_flush_chars(struct tty_struct *tty)
if (!tp) if (!tp)
return; return;
if (tp->char_count > 0) { if (tp->char_count > 0) {
tty3270_do_write(tp, tp->char_buf, tp->char_count); tty3270_do_write(tp, tty, tp->char_buf, tp->char_count);
tp->char_count = 0; tp->char_count = 0;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment