diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-12-08 05:38:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:57 -0500 |
commit | 606d099cdd1080bbb50ea50dc52d98252f8f10a1 (patch) | |
tree | 80d17450a5fb78effce3f4312f672c058658e004 /drivers/s390 | |
parent | edc6afc5496875a640bef0913604be7550c1795d (diff) |
[PATCH] tty: switch to ktermios
This is the grungy swap all the occurrences in the right places patch that
goes with the updates. At this point we have the same functionality as
before (except that sgttyb() returns speeds not zero) and are ready to
begin turning new stuff on providing nobody reports lots of bugs
If you are a tty driver author converting an out of tree driver the only
impact should be termios->ktermios name changes for the speed/property
setting functions from your upper layers.
If you are implementing your own TCGETS function before then your driver
was broken already and its about to get a whole lot more painful for you so
please fix it 8)
Also fill in c_ispeed/ospeed on init for most devices, although the current
code will do this for you anyway but I'd like eventually to lose that extra
paranoia
[akpm@osdl.org: bluetooth fix]
[mp3@de.ibm.com: sclp fix]
[mp3@de.ibm.com: warning fix for tty3270]
[hugh@veritas.com: fix tty_ioctl powerpc build]
[jdike@addtoit.com: uml: fix ->set_termios declaration]
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Martin Peschke <mp3@de.ibm.com>
Acked-by: Peter Oberparleiter <oberpar@de.ibm.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/char/sclp_tty.c | 2 | ||||
-rw-r--r-- | drivers/s390/char/tty3270.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c index 6f43e04dbefd..2d173e5c8a09 100644 --- a/drivers/s390/char/sclp_tty.c +++ b/drivers/s390/char/sclp_tty.c | |||
@@ -60,8 +60,6 @@ static unsigned short int sclp_tty_chars_count; | |||
60 | 60 | ||
61 | struct tty_driver *sclp_tty_driver; | 61 | struct tty_driver *sclp_tty_driver; |
62 | 62 | ||
63 | extern struct termios tty_std_termios; | ||
64 | |||
65 | static struct sclp_ioctls sclp_ioctls; | 63 | static struct sclp_ioctls sclp_ioctls; |
66 | static struct sclp_ioctls sclp_ioctls_init = | 64 | static struct sclp_ioctls sclp_ioctls_init = |
67 | { | 65 | { |
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c index 4717c3611601..09844621edc0 100644 --- a/drivers/s390/char/tty3270.c +++ b/drivers/s390/char/tty3270.c | |||
@@ -1659,7 +1659,7 @@ tty3270_flush_buffer(struct tty_struct *tty) | |||
1659 | * Check for visible/invisible input switches | 1659 | * Check for visible/invisible input switches |
1660 | */ | 1660 | */ |
1661 | static void | 1661 | static void |
1662 | tty3270_set_termios(struct tty_struct *tty, struct termios *old) | 1662 | tty3270_set_termios(struct tty_struct *tty, struct ktermios *old) |
1663 | { | 1663 | { |
1664 | struct tty3270 *tp; | 1664 | struct tty3270 *tp; |
1665 | int new; | 1665 | int new; |