From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: akpm@osdl.org, linux-kernel@vger.kernel.org
Subject: [patch] s390: tty_write fix.
Date: Wed, 27 Oct 2004 16:21:07 +0200 [thread overview]
Message-ID: <20041027142107.GA3405@mschwid3.boeblingen.de.ibm.com> (raw)
[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)
reply other threads:[~2004-10-27 14:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041027142107.GA3405@mschwid3.boeblingen.de.ibm.com \
--to=schwidefsky@de.ibm.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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®