From fc5e4f7ba3aa577fd49be8c37effccc870fc5b22 Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky <schwidefsky@de.ibm.com> Date: Wed, 27 Oct 2004 18:23:01 -0700 Subject: [PATCH] [PATCH] s390: tty_write fix Make the s/390 console drivers compile without warnings again after the recent tty layer change that moved the copy_from_user out of the drivers. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> --- drivers/s390/char/con3215.c | 1 - drivers/s390/char/sclp_tty.c | 4 +--- drivers/s390/char/tty3270.c | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index f9fb773097f7..e74554b9d4d7 100644 --- a/drivers/s390/char/con3215.c +++ b/drivers/s390/char/con3215.c @@ -987,7 +987,6 @@ tty3215_write(struct tty_struct * tty, const unsigned char *buf, int count) { struct raw3215_info *raw; - int length, ret; if (!tty) return 0; diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c index f037a8706283..3491615e36cc 100644 --- a/drivers/s390/char/sclp_tty.c +++ b/drivers/s390/char/sclp_tty.c @@ -397,8 +397,6 @@ sclp_tty_write_string(const unsigned char *str, int count) static int sclp_tty_write(struct tty_struct *tty, const unsigned char *buf, int count) { - int length, ret; - if (sclp_tty_chars_count > 0) { sclp_tty_write_string(sclp_tty_chars, sclp_tty_chars_count); sclp_tty_chars_count = 0; @@ -603,7 +601,7 @@ sclp_get_input(unsigned char *start, unsigned char *end) /* if set in ioctl write operators input to console */ if (sclp_ioctls.echo) - sclp_tty_write(sclp_tty, 0, start, count); + sclp_tty_write(sclp_tty, start, count); /* transfer input to high level driver */ sclp_tty_input(start, count); diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c index a96c5171506d..35a81dfcd242 100644 --- a/drivers/s390/char/tty3270.c +++ b/drivers/s390/char/tty3270.c @@ -1603,7 +1603,6 @@ tty3270_write(struct tty_struct * tty, const unsigned char *buf, int count) { struct tty3270 *tp; - int length, ret; tp = tty->driver_data; if (!tp) -- 2.30.9