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/usb/serial/io_ti.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/usb/serial/io_ti.c')
-rw-r--r-- | drivers/usb/serial/io_ti.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index ee0c921e1520..2da2684e0809 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
@@ -238,7 +238,7 @@ static void edge_tty_recv(struct device *dev, struct tty_struct *tty, unsigned c | |||
238 | static void stop_read(struct edgeport_port *edge_port); | 238 | static void stop_read(struct edgeport_port *edge_port); |
239 | static int restart_read(struct edgeport_port *edge_port); | 239 | static int restart_read(struct edgeport_port *edge_port); |
240 | 240 | ||
241 | static void edge_set_termios (struct usb_serial_port *port, struct termios *old_termios); | 241 | static void edge_set_termios (struct usb_serial_port *port, struct ktermios *old_termios); |
242 | static void edge_send(struct usb_serial_port *port); | 242 | static void edge_send(struct usb_serial_port *port); |
243 | 243 | ||
244 | /* circular buffer */ | 244 | /* circular buffer */ |
@@ -2361,7 +2361,7 @@ static int restart_read(struct edgeport_port *edge_port) | |||
2361 | return status; | 2361 | return status; |
2362 | } | 2362 | } |
2363 | 2363 | ||
2364 | static void change_port_settings (struct edgeport_port *edge_port, struct termios *old_termios) | 2364 | static void change_port_settings (struct edgeport_port *edge_port, struct ktermios *old_termios) |
2365 | { | 2365 | { |
2366 | struct ump_uart_config *config; | 2366 | struct ump_uart_config *config; |
2367 | struct tty_struct *tty; | 2367 | struct tty_struct *tty; |
@@ -2512,7 +2512,7 @@ static void change_port_settings (struct edgeport_port *edge_port, struct termio | |||
2512 | return; | 2512 | return; |
2513 | } | 2513 | } |
2514 | 2514 | ||
2515 | static void edge_set_termios (struct usb_serial_port *port, struct termios *old_termios) | 2515 | static void edge_set_termios (struct usb_serial_port *port, struct ktermios *old_termios) |
2516 | { | 2516 | { |
2517 | struct edgeport_port *edge_port = usb_get_serial_port_data(port); | 2517 | struct edgeport_port *edge_port = usb_get_serial_port_data(port); |
2518 | struct tty_struct *tty = port->tty; | 2518 | struct tty_struct *tty = port->tty; |