aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/mxser_new.c
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2006-12-08 05:38:45 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:57 -0500
commit606d099cdd1080bbb50ea50dc52d98252f8f10a1 (patch)
tree80d17450a5fb78effce3f4312f672c058658e004 /drivers/char/mxser_new.c
parentedc6afc5496875a640bef0913604be7550c1795d (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/char/mxser_new.c')
-rw-r--r--drivers/char/mxser_new.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c
index 369d2742d6be..efa8076c33e0 100644
--- a/drivers/char/mxser_new.c
+++ b/drivers/char/mxser_new.c
@@ -266,8 +266,8 @@ struct mxser_port {
266 int xmit_tail; 266 int xmit_tail;
267 int xmit_cnt; 267 int xmit_cnt;
268 268
269 struct termios normal_termios; 269 struct ktermios normal_termios;
270 struct termios callout_termios; 270 struct ktermios callout_termios;
271 271
272 struct mxser_mon mon_data; 272 struct mxser_mon mon_data;
273 273
@@ -512,7 +512,7 @@ static int mxser_set_baud(struct mxser_port *info, long newspd)
512 * the specified baud rate for a serial port. 512 * the specified baud rate for a serial port.
513 */ 513 */
514static int mxser_change_speed(struct mxser_port *info, 514static int mxser_change_speed(struct mxser_port *info,
515 struct termios *old_termios) 515 struct ktermios *old_termios)
516{ 516{
517 unsigned cflag, cval, fcr; 517 unsigned cflag, cval, fcr;
518 int ret = 0; 518 int ret = 0;
@@ -1966,7 +1966,7 @@ static void mxser_start(struct tty_struct *tty)
1966 spin_unlock_irqrestore(&info->slock, flags); 1966 spin_unlock_irqrestore(&info->slock, flags);
1967} 1967}
1968 1968
1969static void mxser_set_termios(struct tty_struct *tty, struct termios *old_termios) 1969static void mxser_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
1970{ 1970{
1971 struct mxser_port *info = tty->driver_data; 1971 struct mxser_port *info = tty->driver_data;
1972 unsigned long flags; 1972 unsigned long flags;