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/digi_acceleport.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/digi_acceleport.c')
-rw-r--r-- | drivers/usb/serial/digi_acceleport.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index 83d0e21145b0..9d9ea874639c 100644 --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c | |||
@@ -449,7 +449,7 @@ static int digi_transmit_idle( struct usb_serial_port *port, | |||
449 | static void digi_rx_throttle (struct usb_serial_port *port); | 449 | static void digi_rx_throttle (struct usb_serial_port *port); |
450 | static void digi_rx_unthrottle (struct usb_serial_port *port); | 450 | static void digi_rx_unthrottle (struct usb_serial_port *port); |
451 | static void digi_set_termios( struct usb_serial_port *port, | 451 | static void digi_set_termios( struct usb_serial_port *port, |
452 | struct termios *old_termios ); | 452 | struct ktermios *old_termios ); |
453 | static void digi_break_ctl( struct usb_serial_port *port, int break_state ); | 453 | static void digi_break_ctl( struct usb_serial_port *port, int break_state ); |
454 | static int digi_ioctl( struct usb_serial_port *port, struct file *file, | 454 | static int digi_ioctl( struct usb_serial_port *port, struct file *file, |
455 | unsigned int cmd, unsigned long arg ); | 455 | unsigned int cmd, unsigned long arg ); |
@@ -976,7 +976,7 @@ dbg( "digi_rx_unthrottle: TOP: port=%d", priv->dp_port_num ); | |||
976 | 976 | ||
977 | 977 | ||
978 | static void digi_set_termios( struct usb_serial_port *port, | 978 | static void digi_set_termios( struct usb_serial_port *port, |
979 | struct termios *old_termios ) | 979 | struct ktermios *old_termios ) |
980 | { | 980 | { |
981 | 981 | ||
982 | struct digi_port *priv = usb_get_serial_port_data(port); | 982 | struct digi_port *priv = usb_get_serial_port_data(port); |
@@ -1463,7 +1463,7 @@ static int digi_open( struct usb_serial_port *port, struct file *filp ) | |||
1463 | int ret; | 1463 | int ret; |
1464 | unsigned char buf[32]; | 1464 | unsigned char buf[32]; |
1465 | struct digi_port *priv = usb_get_serial_port_data(port); | 1465 | struct digi_port *priv = usb_get_serial_port_data(port); |
1466 | struct termios not_termios; | 1466 | struct ktermios not_termios; |
1467 | unsigned long flags = 0; | 1467 | unsigned long flags = 0; |
1468 | 1468 | ||
1469 | 1469 | ||