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/serial/ioc4_serial.c | |
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/serial/ioc4_serial.c')
-rw-r--r-- | drivers/serial/ioc4_serial.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c index 711bd1511439..c862f67c985a 100644 --- a/drivers/serial/ioc4_serial.c +++ b/drivers/serial/ioc4_serial.c | |||
@@ -1681,7 +1681,7 @@ static void transmit_chars(struct uart_port *the_port) | |||
1681 | */ | 1681 | */ |
1682 | static void | 1682 | static void |
1683 | ioc4_change_speed(struct uart_port *the_port, | 1683 | ioc4_change_speed(struct uart_port *the_port, |
1684 | struct termios *new_termios, struct termios *old_termios) | 1684 | struct ktermios *new_termios, struct ktermios *old_termios) |
1685 | { | 1685 | { |
1686 | struct ioc4_port *port = get_ioc4_port(the_port, 0); | 1686 | struct ioc4_port *port = get_ioc4_port(the_port, 0); |
1687 | int baud, bits; | 1687 | int baud, bits; |
@@ -1802,7 +1802,7 @@ static inline int ic4_startup_local(struct uart_port *the_port) | |||
1802 | ioc4_set_proto(port, the_port->mapbase); | 1802 | ioc4_set_proto(port, the_port->mapbase); |
1803 | 1803 | ||
1804 | /* set the speed of the serial port */ | 1804 | /* set the speed of the serial port */ |
1805 | ioc4_change_speed(the_port, info->tty->termios, (struct termios *)0); | 1805 | ioc4_change_speed(the_port, info->tty->termios, (struct ktermios *)0); |
1806 | 1806 | ||
1807 | return 0; | 1807 | return 0; |
1808 | } | 1808 | } |
@@ -2570,7 +2570,7 @@ static int ic4_startup(struct uart_port *the_port) | |||
2570 | */ | 2570 | */ |
2571 | static void | 2571 | static void |
2572 | ic4_set_termios(struct uart_port *the_port, | 2572 | ic4_set_termios(struct uart_port *the_port, |
2573 | struct termios *termios, struct termios *old_termios) | 2573 | struct ktermios *termios, struct ktermios *old_termios) |
2574 | { | 2574 | { |
2575 | unsigned long port_flags; | 2575 | unsigned long port_flags; |
2576 | 2576 | ||