mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [patch] s390: tty_write fix.
@ 2004-10-27 14:21 Martin Schwidefsky
  0 siblings, 0 replies; only message in thread
From: Martin Schwidefsky @ 2004-10-27 14:21 UTC (permalink / raw)
  To: akpm, linux-kernel

[patch] s390: tty_write fix.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

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>

diffstat:
 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 -urN linux-2.6/drivers/s390/char/con3215.c linux-2.6-patched/drivers/s390/char/con3215.c
--- linux-2.6/drivers/s390/char/con3215.c	2004-10-27 12:20:48.000000000 +0200
+++ linux-2.6-patched/drivers/s390/char/con3215.c	2004-10-27 12:21:03.000000000 +0200
@@ -987,7 +987,6 @@
 	      const unsigned char *buf, int count)
 {
 	struct raw3215_info *raw;
-	int length, ret;
 
 	if (!tty)
 		return 0;
diff -urN linux-2.6/drivers/s390/char/sclp_tty.c linux-2.6-patched/drivers/s390/char/sclp_tty.c
--- linux-2.6/drivers/s390/char/sclp_tty.c	2004-10-27 12:20:48.000000000 +0200
+++ linux-2.6-patched/drivers/s390/char/sclp_tty.c	2004-10-27 12:21:03.000000000 +0200
@@ -397,8 +397,6 @@
 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 @@
 
 	/* 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 -urN linux-2.6/drivers/s390/char/tty3270.c linux-2.6-patched/drivers/s390/char/tty3270.c
--- linux-2.6/drivers/s390/char/tty3270.c	2004-10-27 12:20:48.000000000 +0200
+++ linux-2.6-patched/drivers/s390/char/tty3270.c	2004-10-27 12:21:03.000000000 +0200
@@ -1603,7 +1603,6 @@
 	      const unsigned char *buf, int count)
 {
 	struct tty3270 *tp;
-	int length, ret;
 
 	tp = tty->driver_data;
 	if (!tp)

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2004-10-27 14:23 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-10-27 14:21 [patch] s390: tty_write fix Martin Schwidefsky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®