Commit fc5e4f7b authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Linus Torvalds

[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: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 018581b9
...@@ -987,7 +987,6 @@ tty3215_write(struct tty_struct * tty, ...@@ -987,7 +987,6 @@ tty3215_write(struct tty_struct * tty,
const unsigned char *buf, int count) const unsigned char *buf, int count)
{ {
struct raw3215_info *raw; struct raw3215_info *raw;
int length, ret;
if (!tty) if (!tty)
return 0; return 0;
......
...@@ -397,8 +397,6 @@ sclp_tty_write_string(const unsigned char *str, int count) ...@@ -397,8 +397,6 @@ sclp_tty_write_string(const unsigned char *str, int count)
static int static int
sclp_tty_write(struct tty_struct *tty, const unsigned char *buf, int count) sclp_tty_write(struct tty_struct *tty, const unsigned char *buf, int count)
{ {
int length, ret;
if (sclp_tty_chars_count > 0) { if (sclp_tty_chars_count > 0) {
sclp_tty_write_string(sclp_tty_chars, sclp_tty_chars_count); sclp_tty_write_string(sclp_tty_chars, sclp_tty_chars_count);
sclp_tty_chars_count = 0; sclp_tty_chars_count = 0;
...@@ -603,7 +601,7 @@ sclp_get_input(unsigned char *start, unsigned char *end) ...@@ -603,7 +601,7 @@ sclp_get_input(unsigned char *start, unsigned char *end)
/* if set in ioctl write operators input to console */ /* if set in ioctl write operators input to console */
if (sclp_ioctls.echo) 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 */ /* transfer input to high level driver */
sclp_tty_input(start, count); sclp_tty_input(start, count);
......
...@@ -1603,7 +1603,6 @@ tty3270_write(struct tty_struct * tty, ...@@ -1603,7 +1603,6 @@ tty3270_write(struct tty_struct * tty,
const unsigned char *buf, int count) const unsigned char *buf, int count)
{ {
struct tty3270 *tp; struct tty3270 *tp;
int length, ret;
tp = tty->driver_data; tp = tty->driver_data;
if (!tp) if (!tp)
......
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