tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by

Alan Cox and committed by
Linus Torvalds 606d099c edc6afc5

+301 -253
+1 -1
arch/um/drivers/line.c
··· 246 246 return ret; 247 247 } 248 248 249 - void line_set_termios(struct tty_struct *tty, struct termios * old) 249 + void line_set_termios(struct tty_struct *tty, struct ktermios * old) 250 250 { 251 251 /* nothing */ 252 252 }
+1 -1
arch/um/include/line.h
··· 76 76 extern int line_write(struct tty_struct *tty, const unsigned char *buf, 77 77 int len); 78 78 extern void line_put_char(struct tty_struct *tty, unsigned char ch); 79 - extern void line_set_termios(struct tty_struct *tty, struct termios * old); 79 + extern void line_set_termios(struct tty_struct *tty, struct ktermios * old); 80 80 extern int line_chars_in_buffer(struct tty_struct *tty); 81 81 extern void line_flush_buffer(struct tty_struct *tty); 82 82 extern void line_flush_chars(struct tty_struct *tty);
+3 -3
drivers/char/amiserial.c
··· 104 104 105 105 static unsigned char current_ctl_bits; 106 106 107 - static void change_speed(struct async_struct *info, struct termios *old); 107 + static void change_speed(struct async_struct *info, struct ktermios *old); 108 108 static void rs_wait_until_sent(struct tty_struct *tty, int timeout); 109 109 110 110 ··· 694 694 * the specified baud rate for a serial port. 695 695 */ 696 696 static void change_speed(struct async_struct *info, 697 - struct termios *old_termios) 697 + struct ktermios *old_termios) 698 698 { 699 699 int quot = 0, baud_base, baud; 700 700 unsigned cflag, cval = 0; ··· 1365 1365 return 0; 1366 1366 } 1367 1367 1368 - static void rs_set_termios(struct tty_struct *tty, struct termios *old_termios) 1368 + static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 1369 1369 { 1370 1370 struct async_struct *info = (struct async_struct *)tty->driver_data; 1371 1371 unsigned long flags;
+1 -1
drivers/char/cyclades.c
··· 4101 4101 * where old == NULL, and try to do something rational. 4102 4102 */ 4103 4103 static void 4104 - cy_set_termios(struct tty_struct *tty, struct termios * old_termios) 4104 + cy_set_termios(struct tty_struct *tty, struct ktermios * old_termios) 4105 4105 { 4106 4106 struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; 4107 4107
+11 -5
drivers/char/epca.c
··· 199 199 unsigned int, unsigned long); 200 200 static int info_ioctl(struct tty_struct *, struct file *, 201 201 unsigned int, unsigned long); 202 - static void pc_set_termios(struct tty_struct *, struct termios *); 202 + static void pc_set_termios(struct tty_struct *, struct ktermios *); 203 203 static void do_softint(struct work_struct *work); 204 204 static void pc_stop(struct tty_struct *); 205 205 static void pc_start(struct tty_struct *); ··· 1236 1236 pc_driver->init_termios.c_oflag = 0; 1237 1237 pc_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | CLOCAL | HUPCL; 1238 1238 pc_driver->init_termios.c_lflag = 0; 1239 + pc_driver->init_termios.c_ispeed = 9600; 1240 + pc_driver->init_termios.c_ospeed = 9600; 1239 1241 pc_driver->flags = TTY_DRIVER_REAL_RAW; 1240 1242 tty_set_operations(pc_driver, &pc_ops); 1241 1243 ··· 1252 1250 pc_info->init_termios.c_oflag = 0; 1253 1251 pc_info->init_termios.c_lflag = 0; 1254 1252 pc_info->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL; 1253 + pc_info->init_termios.c_ispeed = 9600; 1254 + pc_info->init_termios.c_ospeed = 9600; 1255 1255 pc_info->flags = TTY_DRIVER_REAL_RAW; 1256 1256 tty_set_operations(pc_info, &info_ops); 1257 1257 ··· 2003 1999 { /* Begin epcaparam */ 2004 2000 2005 2001 unsigned int cmdHead; 2006 - struct termios *ts; 2002 + struct ktermios *ts; 2007 2003 struct board_chan __iomem *bc; 2008 2004 unsigned mval, hflow, cflag, iflag; 2009 2005 ··· 2118 2114 { /* Begin receive_data */ 2119 2115 2120 2116 unchar *rptr; 2121 - struct termios *ts = NULL; 2117 + struct ktermios *ts = NULL; 2122 2118 struct tty_struct *tty; 2123 2119 struct board_chan __iomem *bc; 2124 2120 int dataToRead, wrapgap, bytesAvailable; ··· 2366 2362 switch (cmd) 2367 2363 { /* Begin switch cmd */ 2368 2364 2365 + #if 0 /* Handled by calling layer properly */ 2369 2366 case TCGETS: 2370 - if (copy_to_user(argp, tty->termios, sizeof(struct termios))) 2367 + if (copy_to_user(argp, tty->termios, sizeof(struct ktermios))) 2371 2368 return -EFAULT; 2372 2369 return 0; 2373 2370 case TCGETA: 2374 2371 return get_termio(tty, argp); 2372 + #endif 2375 2373 case TCSBRK: /* SVID version: non-zero arg --> no break */ 2376 2374 retval = tty_check_change(tty); 2377 2375 if (retval) ··· 2542 2536 2543 2537 /* --------------------- Begin pc_set_termios ----------------------- */ 2544 2538 2545 - static void pc_set_termios(struct tty_struct *tty, struct termios *old_termios) 2539 + static void pc_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 2546 2540 { /* Begin pc_set_termios */ 2547 2541 2548 2542 struct channel *ch;
+1 -1
drivers/char/esp.c
··· 1915 1915 return 0; 1916 1916 } 1917 1917 1918 - static void rs_set_termios(struct tty_struct *tty, struct termios *old_termios) 1918 + static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 1919 1919 { 1920 1920 struct esp_struct *info = (struct esp_struct *)tty->driver_data; 1921 1921 unsigned long flags;
+2 -2
drivers/char/generic_serial.c
··· 718 718 719 719 720 720 void gs_set_termios (struct tty_struct * tty, 721 - struct termios * old_termios) 721 + struct ktermios * old_termios) 722 722 { 723 723 struct gs_port *port; 724 724 int baudrate, tmp, rv; 725 - struct termios *tiosp; 725 + struct ktermios *tiosp; 726 726 727 727 func_enter(); 728 728
+4 -2
drivers/char/hvcs.c
··· 192 192 * that will cause echoing or we'll go into recursive loop echoing chars back 193 193 * and forth with the console drivers. 194 194 */ 195 - static struct termios hvcs_tty_termios = { 195 + static struct ktermios hvcs_tty_termios = { 196 196 .c_iflag = IGNBRK | IGNPAR, 197 197 .c_oflag = OPOST, 198 198 .c_cflag = B38400 | CS8 | CREAD | HUPCL, 199 - .c_cc = INIT_C_CC 199 + .c_cc = INIT_C_CC, 200 + .c_ispeed = 38400, 201 + .c_ospeed = 38400 200 202 }; 201 203 202 204 /*
+2
drivers/char/hvsi.c
··· 1161 1161 hvsi_driver->type = TTY_DRIVER_TYPE_SYSTEM; 1162 1162 hvsi_driver->init_termios = tty_std_termios; 1163 1163 hvsi_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL; 1164 + hvsi_driver->init_termios.c_ispeed = 9600; 1165 + hvsi_driver->init_termios.c_ospeed = 9600; 1164 1166 hvsi_driver->flags = TTY_DRIVER_REAL_RAW; 1165 1167 tty_set_operations(hvsi_driver, &hvsi_ops); 1166 1168
+5 -5
drivers/char/ip2/ip2main.c
··· 177 177 static int ip2_chars_in_buf(PTTY); 178 178 static void ip2_flush_buffer(PTTY); 179 179 static int ip2_ioctl(PTTY, struct file *, UINT, ULONG); 180 - static void ip2_set_termios(PTTY, struct termios *); 180 + static void ip2_set_termios(PTTY, struct ktermios *); 181 181 static void ip2_set_line_discipline(PTTY); 182 182 static void ip2_throttle(PTTY); 183 183 static void ip2_unthrottle(PTTY); ··· 198 198 199 199 static void ip2_wait_until_sent(PTTY,int); 200 200 201 - static void set_params (i2ChanStrPtr, struct termios *); 201 + static void set_params (i2ChanStrPtr, struct ktermios *); 202 202 static int get_serial_info(i2ChanStrPtr, struct serial_struct __user *); 203 203 static int set_serial_info(i2ChanStrPtr, struct serial_struct __user *); 204 204 ··· 2398 2398 /* */ 2399 2399 /******************************************************************************/ 2400 2400 static void 2401 - ip2_set_termios( PTTY tty, struct termios *old_termios ) 2401 + ip2_set_termios( PTTY tty, struct ktermios *old_termios ) 2402 2402 { 2403 2403 i2ChanStrPtr pCh = (i2ChanStrPtr)tty->driver_data; 2404 2404 ··· 2440 2440 /* change. */ 2441 2441 /******************************************************************************/ 2442 2442 static void 2443 - set_params( i2ChanStrPtr pCh, struct termios *o_tios ) 2443 + set_params( i2ChanStrPtr pCh, struct ktermios *o_tios ) 2444 2444 { 2445 2445 tcflag_t cflag, iflag, lflag; 2446 2446 char stop_char, start_char; 2447 - struct termios dummy; 2447 + struct ktermios dummy; 2448 2448 2449 2449 lflag = pCh->pTTY->termios->c_lflag; 2450 2450 cflag = pCh->pTTY->termios->c_cflag;
+1 -1
drivers/char/isicom.c
··· 1399 1399 1400 1400 /* set_termios et all */ 1401 1401 static void isicom_set_termios(struct tty_struct *tty, 1402 - struct termios *old_termios) 1402 + struct ktermios *old_termios) 1403 1403 { 1404 1404 struct isi_port *port = tty->driver_data; 1405 1405
+8 -6
drivers/char/istallion.c
··· 194 194 * with this termios initially. Basically all it defines is a raw port 195 195 * at 9600 baud, 8 data bits, no parity, 1 stop bit. 196 196 */ 197 - static struct termios stli_deftermios = { 197 + static struct ktermios stli_deftermios = { 198 198 .c_cflag = (B9600 | CS8 | CREAD | HUPCL | CLOCAL), 199 199 .c_cc = INIT_C_CC, 200 + .c_ispeed = 9600, 201 + .c_ospeed = 9600, 200 202 }; 201 203 202 204 /* ··· 641 639 static int stli_writeroom(struct tty_struct *tty); 642 640 static int stli_charsinbuffer(struct tty_struct *tty); 643 641 static int stli_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg); 644 - static void stli_settermios(struct tty_struct *tty, struct termios *old); 642 + static void stli_settermios(struct tty_struct *tty, struct ktermios *old); 645 643 static void stli_throttle(struct tty_struct *tty); 646 644 static void stli_unthrottle(struct tty_struct *tty); 647 645 static void stli_stop(struct tty_struct *tty); ··· 671 669 static void stli_sendcmd(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd, void *arg, int size, int copyback); 672 670 static void __stli_sendcmd(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd, void *arg, int size, int copyback); 673 671 static void stli_dodelaycmd(stliport_t *portp, cdkctrl_t __iomem *cp); 674 - static void stli_mkasyport(stliport_t *portp, asyport_t *pp, struct termios *tiosp); 672 + static void stli_mkasyport(stliport_t *portp, asyport_t *pp, struct ktermios *tiosp); 675 673 static void stli_mkasysigs(asysigs_t *sp, int dtr, int rts); 676 674 static long stli_mktiocm(unsigned long sigvalue); 677 675 static void stli_read(stlibrd_t *brdp, stliport_t *portp); ··· 1891 1889 * Looks like it is true for the current ttys implementation..!! 1892 1890 */ 1893 1891 1894 - static void stli_settermios(struct tty_struct *tty, struct termios *old) 1892 + static void stli_settermios(struct tty_struct *tty, struct ktermios *old) 1895 1893 { 1896 1894 stliport_t *portp; 1897 1895 stlibrd_t *brdp; 1898 - struct termios *tiosp; 1896 + struct ktermios *tiosp; 1899 1897 asyport_t aport; 1900 1898 1901 1899 if (tty == NULL) ··· 2732 2730 * the slave. 2733 2731 */ 2734 2732 2735 - static void stli_mkasyport(stliport_t *portp, asyport_t *pp, struct termios *tiosp) 2733 + static void stli_mkasyport(stliport_t *portp, asyport_t *pp, struct ktermios *tiosp) 2736 2734 { 2737 2735 memset(pp, 0, sizeof(asyport_t)); 2738 2736
+10 -8
drivers/char/moxa.c
··· 234 234 static int moxa_ioctl(struct tty_struct *, struct file *, unsigned int, unsigned long); 235 235 static void moxa_throttle(struct tty_struct *); 236 236 static void moxa_unthrottle(struct tty_struct *); 237 - static void moxa_set_termios(struct tty_struct *, struct termios *); 237 + static void moxa_set_termios(struct tty_struct *, struct ktermios *); 238 238 static void moxa_stop(struct tty_struct *); 239 239 static void moxa_start(struct tty_struct *); 240 240 static void moxa_hangup(struct tty_struct *); ··· 261 261 static void MoxaPortDisable(int); 262 262 static long MoxaPortGetMaxBaud(int); 263 263 static long MoxaPortSetBaud(int, long); 264 - static int MoxaPortSetTermio(int, struct termios *, speed_t); 264 + static int MoxaPortSetTermio(int, struct ktermios *, speed_t); 265 265 static int MoxaPortGetLineOut(int, int *, int *); 266 266 static void MoxaPortLineCtrl(int, int, int); 267 267 static void MoxaPortFlowCtrl(int, int, int, int, int, int); ··· 355 355 moxaDriver->init_termios.c_oflag = 0; 356 356 moxaDriver->init_termios.c_cflag = B9600 | CS8 | CREAD | CLOCAL | HUPCL; 357 357 moxaDriver->init_termios.c_lflag = 0; 358 + moxaDriver->init_termios.c_ispeed = 9600; 359 + moxaDriver->init_termios.c_ospeed = 9600; 358 360 moxaDriver->flags = TTY_DRIVER_REAL_RAW; 359 361 tty_set_operations(moxaDriver, &moxa_ops); 360 362 ··· 866 864 } 867 865 868 866 static void moxa_set_termios(struct tty_struct *tty, 869 - struct termios *old_termios) 867 + struct ktermios *old_termios) 870 868 { 871 869 struct moxa_str *ch = (struct moxa_str *) tty->driver_data; 872 870 ··· 980 978 981 979 static void set_tty_param(struct tty_struct *tty) 982 980 { 983 - register struct termios *ts; 981 + register struct ktermios *ts; 984 982 struct moxa_str *ch; 985 983 int rts, cts, txflow, rxflow, xany; 986 984 ··· 1151 1149 static void receive_data(struct moxa_str *ch) 1152 1150 { 1153 1151 struct tty_struct *tp; 1154 - struct termios *ts; 1152 + struct ktermios *ts; 1155 1153 unsigned long flags; 1156 1154 1157 1155 ts = NULL; ··· 1914 1912 * 1915 1913 * Function 12: Configure the port. 1916 1914 * Syntax: 1917 - * int MoxaPortSetTermio(int port, struct termios *termio, speed_t baud); 1915 + * int MoxaPortSetTermio(int port, struct ktermios *termio, speed_t baud); 1918 1916 * int port : port number (0 - 127) 1919 - * struct termios * termio : termio structure pointer 1917 + * struct ktermios * termio : termio structure pointer 1920 1918 * speed_t baud : baud rate 1921 1919 * 1922 1920 * return: -1 : this port is invalid or termio == NULL ··· 2197 2195 return (baud); 2198 2196 } 2199 2197 2200 - int MoxaPortSetTermio(int port, struct termios *termio, speed_t baud) 2198 + int MoxaPortSetTermio(int port, struct ktermios *termio, speed_t baud) 2201 2199 { 2202 2200 void __iomem *ofsAddr; 2203 2201 tcflag_t cflag;
+10 -8
drivers/char/mxser.c
··· 328 328 int xmit_tail; 329 329 int xmit_cnt; 330 330 struct work_struct tqueue; 331 - struct termios normal_termios; 332 - struct termios callout_termios; 331 + struct ktermios normal_termios; 332 + struct ktermios callout_termios; 333 333 wait_queue_head_t open_wait; 334 334 wait_queue_head_t close_wait; 335 335 wait_queue_head_t delta_msr_wait; ··· 364 364 static struct tty_driver *mxvar_sdriver; 365 365 static struct mxser_struct mxvar_table[MXSER_PORTS]; 366 366 static struct tty_struct *mxvar_tty[MXSER_PORTS + 1]; 367 - static struct termios *mxvar_termios[MXSER_PORTS + 1]; 368 - static struct termios *mxvar_termios_locked[MXSER_PORTS + 1]; 367 + static struct ktermios *mxvar_termios[MXSER_PORTS + 1]; 368 + static struct ktermios *mxvar_termios_locked[MXSER_PORTS + 1]; 369 369 static struct mxser_log mxvar_log; 370 370 static int mxvar_diagflag; 371 371 static unsigned char mxser_msr[MXSER_PORTS + 1]; ··· 402 402 static int mxser_ioctl_special(unsigned int, void __user *); 403 403 static void mxser_throttle(struct tty_struct *); 404 404 static void mxser_unthrottle(struct tty_struct *); 405 - static void mxser_set_termios(struct tty_struct *, struct termios *); 405 + static void mxser_set_termios(struct tty_struct *, struct ktermios *); 406 406 static void mxser_stop(struct tty_struct *); 407 407 static void mxser_start(struct tty_struct *); 408 408 static void mxser_hangup(struct tty_struct *); ··· 414 414 static int mxser_block_til_ready(struct tty_struct *, struct file *, struct mxser_struct *); 415 415 static int mxser_startup(struct mxser_struct *); 416 416 static void mxser_shutdown(struct mxser_struct *); 417 - static int mxser_change_speed(struct mxser_struct *, struct termios *old_termios); 417 + static int mxser_change_speed(struct mxser_struct *, struct ktermios *old_termios); 418 418 static int mxser_get_serial_info(struct mxser_struct *, struct serial_struct __user *); 419 419 static int mxser_set_serial_info(struct mxser_struct *, struct serial_struct __user *); 420 420 static int mxser_get_lsr_info(struct mxser_struct *, unsigned int __user *); ··· 726 726 mxvar_sdriver->subtype = SERIAL_TYPE_NORMAL; 727 727 mxvar_sdriver->init_termios = tty_std_termios; 728 728 mxvar_sdriver->init_termios.c_cflag = B9600|CS8|CREAD|HUPCL|CLOCAL; 729 + mxvar_sdriver->init_termios.c_ispeed = 9600; 730 + mxvar_sdriver->init_termios.c_ospeed = 9600; 729 731 mxvar_sdriver->flags = TTY_DRIVER_REAL_RAW; 730 732 tty_set_operations(mxvar_sdriver, &mxser_ops); 731 733 mxvar_sdriver->ttys = mxvar_tty; ··· 1751 1749 /* MX_UNLOCK(&info->slock); */ 1752 1750 } 1753 1751 1754 - static void mxser_set_termios(struct tty_struct *tty, struct termios *old_termios) 1752 + static void mxser_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 1755 1753 { 1756 1754 struct mxser_struct *info = tty->driver_data; 1757 1755 unsigned long flags; ··· 2543 2541 * This routine is called to set the UART divisor registers to match 2544 2542 * the specified baud rate for a serial port. 2545 2543 */ 2546 - static int mxser_change_speed(struct mxser_struct *info, struct termios *old_termios) 2544 + static int mxser_change_speed(struct mxser_struct *info, struct ktermios *old_termios) 2547 2545 { 2548 2546 unsigned cflag, cval, fcr; 2549 2547 int ret = 0;
+4 -4
drivers/char/mxser_new.c
··· 266 266 int xmit_tail; 267 267 int xmit_cnt; 268 268 269 - struct termios normal_termios; 270 - struct termios callout_termios; 269 + struct ktermios normal_termios; 270 + struct ktermios callout_termios; 271 271 272 272 struct mxser_mon mon_data; 273 273 ··· 512 512 * the specified baud rate for a serial port. 513 513 */ 514 514 static int mxser_change_speed(struct mxser_port *info, 515 - struct termios *old_termios) 515 + struct ktermios *old_termios) 516 516 { 517 517 unsigned cflag, cval, fcr; 518 518 int ret = 0; ··· 1966 1966 spin_unlock_irqrestore(&info->slock, flags); 1967 1967 } 1968 1968 1969 - static void mxser_set_termios(struct tty_struct *tty, struct termios *old_termios) 1969 + static void mxser_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 1970 1970 { 1971 1971 struct mxser_port *info = tty->driver_data; 1972 1972 unsigned long flags;
+2 -2
drivers/char/n_r3964.c
··· 142 142 const unsigned char * buf, size_t nr); 143 143 static int r3964_ioctl(struct tty_struct * tty, struct file * file, 144 144 unsigned int cmd, unsigned long arg); 145 - static void r3964_set_termios(struct tty_struct *tty, struct termios * old); 145 + static void r3964_set_termios(struct tty_struct *tty, struct ktermios * old); 146 146 static unsigned int r3964_poll(struct tty_struct * tty, struct file * file, 147 147 struct poll_table_struct *wait); 148 148 static void r3964_receive_buf(struct tty_struct *tty, const unsigned char *cp, ··· 1347 1347 } 1348 1348 } 1349 1349 1350 - static void r3964_set_termios(struct tty_struct *tty, struct termios * old) 1350 + static void r3964_set_termios(struct tty_struct *tty, struct ktermios * old) 1351 1351 { 1352 1352 TRACE_L("set_termios"); 1353 1353 }
+1 -1
drivers/char/n_tty.c
··· 994 994 * when the ldisc is closed. 995 995 */ 996 996 997 - static void n_tty_set_termios(struct tty_struct *tty, struct termios * old) 997 + static void n_tty_set_termios(struct tty_struct *tty, struct ktermios * old) 998 998 { 999 999 if (!tty) 1000 1000 return;
+9 -1
drivers/char/pty.c
··· 218 218 return retval; 219 219 } 220 220 221 - static void pty_set_termios(struct tty_struct *tty, struct termios *old_termios) 221 + static void pty_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 222 222 { 223 223 tty->termios->c_cflag &= ~(CSIZE | PARENB); 224 224 tty->termios->c_cflag |= (CS8 | CREAD); ··· 272 272 pty_driver->init_termios.c_oflag = 0; 273 273 pty_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; 274 274 pty_driver->init_termios.c_lflag = 0; 275 + pty_driver->init_termios.c_ispeed = 38400; 276 + pty_driver->init_termios.c_ospeed = 38400; 275 277 pty_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW; 276 278 pty_driver->other = pty_slave_driver; 277 279 tty_set_operations(pty_driver, &pty_ops); ··· 288 286 pty_slave_driver->subtype = PTY_TYPE_SLAVE; 289 287 pty_slave_driver->init_termios = tty_std_termios; 290 288 pty_slave_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; 289 + pty_slave_driver->init_termios.c_ispeed = 38400; 290 + pty_slave_driver->init_termios.c_ospeed = 38400; 291 291 pty_slave_driver->flags = TTY_DRIVER_RESET_TERMIOS | 292 292 TTY_DRIVER_REAL_RAW; 293 293 pty_slave_driver->other = pty_driver; ··· 370 366 ptm_driver->init_termios.c_oflag = 0; 371 367 ptm_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; 372 368 ptm_driver->init_termios.c_lflag = 0; 369 + ptm_driver->init_termios.c_ispeed = 38400; 370 + ptm_driver->init_termios.c_ospeed = 38400; 373 371 ptm_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW | 374 372 TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM; 375 373 ptm_driver->other = pts_driver; ··· 387 381 pts_driver->subtype = PTY_TYPE_SLAVE; 388 382 pts_driver->init_termios = tty_std_termios; 389 383 pts_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; 384 + pts_driver->init_termios.c_ispeed = 38400; 385 + pts_driver->init_termios.c_ospeed = 38400; 390 386 pts_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW | 391 387 TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM; 392 388 pts_driver->other = ptm_driver;
+3 -1
drivers/char/riscom8.c
··· 1539 1539 wake_up_interruptible(&port->open_wait); 1540 1540 } 1541 1541 1542 - static void rc_set_termios(struct tty_struct * tty, struct termios * old_termios) 1542 + static void rc_set_termios(struct tty_struct * tty, struct ktermios * old_termios) 1543 1543 { 1544 1544 struct riscom_port *port = (struct riscom_port *)tty->driver_data; 1545 1545 unsigned long flags; ··· 1614 1614 riscom_driver->init_termios = tty_std_termios; 1615 1615 riscom_driver->init_termios.c_cflag = 1616 1616 B9600 | CS8 | CREAD | HUPCL | CLOCAL; 1617 + riscom_driver->init_termios.c_ispeed = 9600; 1618 + riscom_driver->init_termios.c_ospeed = 9600; 1617 1619 riscom_driver->flags = TTY_DRIVER_REAL_RAW; 1618 1620 tty_set_operations(riscom_driver, &riscom_ops); 1619 1621 if ((error = tty_register_driver(riscom_driver))) {
+5 -3
drivers/char/rocket.c
··· 712 712 * user mode into the driver (exception handler). *info CD manipulation is spinlock protected. 713 713 */ 714 714 static void configure_r_port(struct r_port *info, 715 - struct termios *old_termios) 715 + struct ktermios *old_termios) 716 716 { 717 717 unsigned cflag; 718 718 unsigned long flags; ··· 1194 1194 } 1195 1195 1196 1196 static void rp_set_termios(struct tty_struct *tty, 1197 - struct termios *old_termios) 1197 + struct ktermios *old_termios) 1198 1198 { 1199 1199 struct r_port *info = (struct r_port *) tty->driver_data; 1200 1200 CHANNEL_t *cp; ··· 2214 2214 int count = 0; 2215 2215 2216 2216 /* Work through the PCI device list, pulling out ours */ 2217 - while ((dev = pci_find_device(PCI_VENDOR_ID_RP, PCI_ANY_ID, dev))) { 2217 + while ((dev = pci_get_device(PCI_VENDOR_ID_RP, PCI_ANY_ID, dev))) { 2218 2218 if (register_PCI(count + boards_found, dev)) 2219 2219 count++; 2220 2220 } ··· 2436 2436 rocket_driver->init_termios = tty_std_termios; 2437 2437 rocket_driver->init_termios.c_cflag = 2438 2438 B9600 | CS8 | CREAD | HUPCL | CLOCAL; 2439 + rocket_driver->init_termios.c_ispeed = 9600; 2440 + rocket_driver->init_termios.c_ospeed = 9600; 2439 2441 #ifdef ROCKET_SOFT_FLOW 2440 2442 rocket_driver->flags |= TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 2441 2443 #endif
+2
drivers/char/ser_a2232.c
··· 695 695 a2232_driver->init_termios = tty_std_termios; 696 696 a2232_driver->init_termios.c_cflag = 697 697 B9600 | CS8 | CREAD | HUPCL | CLOCAL; 698 + a2232_driver->init_termios.c_ispeed = 9600; 699 + a2232_driver->init_termios.c_ospeed = 9600; 698 700 a2232_driver->flags = TTY_DRIVER_REAL_RAW; 699 701 tty_set_operations(a2232_driver, &a2232_ops); 700 702 if ((error = tty_register_driver(a2232_driver))) {
+1 -1
drivers/char/serial167.c
··· 1695 1695 1696 1696 1697 1697 static void 1698 - cy_set_termios(struct tty_struct *tty, struct termios * old_termios) 1698 + cy_set_termios(struct tty_struct *tty, struct ktermios * old_termios) 1699 1699 { 1700 1700 struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; 1701 1701
+7 -2
drivers/char/specialix.c
··· 2311 2311 } 2312 2312 2313 2313 2314 - static void sx_set_termios(struct tty_struct * tty, struct termios * old_termios) 2314 + static void sx_set_termios(struct tty_struct * tty, struct ktermios * old_termios) 2315 2315 { 2316 2316 struct specialix_port *port = (struct specialix_port *)tty->driver_data; 2317 2317 unsigned long flags; ··· 2400 2400 specialix_driver->init_termios = tty_std_termios; 2401 2401 specialix_driver->init_termios.c_cflag = 2402 2402 B9600 | CS8 | CREAD | HUPCL | CLOCAL; 2403 + specialix_driver->init_termios.c_ispeed = 9600; 2404 + specialix_driver->init_termios.c_ospeed = 9600; 2403 2405 specialix_driver->flags = TTY_DRIVER_REAL_RAW; 2404 2406 tty_set_operations(specialix_driver, &sx_ops); 2405 2407 ··· 2477 2475 i++; 2478 2476 continue; 2479 2477 } 2480 - pdev = pci_find_device (PCI_VENDOR_ID_SPECIALIX, 2478 + pdev = pci_get_device (PCI_VENDOR_ID_SPECIALIX, 2481 2479 PCI_DEVICE_ID_SPECIALIX_IO8, 2482 2480 pdev); 2483 2481 if (!pdev) break; ··· 2493 2491 if (!sx_probe(&sx_board[i])) 2494 2492 found ++; 2495 2493 } 2494 + /* May exit pci_get sequence early with lots of boards */ 2495 + if (pdev != NULL) 2496 + pci_dev_put(pdev); 2496 2497 } 2497 2498 #endif 2498 2499
+11 -9
drivers/char/stallion.c
··· 141 141 * with this termios initially. Basically all it defines is a raw port 142 142 * at 9600, 8 data bits, 1 stop bit. 143 143 */ 144 - static struct termios stl_deftermios = { 144 + static struct ktermios stl_deftermios = { 145 145 .c_cflag = (B9600 | CS8 | CREAD | HUPCL | CLOCAL), 146 146 .c_cc = INIT_C_CC, 147 + .c_ispeed = 9600, 148 + .c_ospeed = 9600, 147 149 }; 148 150 149 151 /* ··· 466 464 static int stl_cd1400updatereg(struct stlport *portp, int regnr, int value); 467 465 static int stl_cd1400panelinit(struct stlbrd *brdp, struct stlpanel *panelp); 468 466 static void stl_cd1400portinit(struct stlbrd *brdp, struct stlpanel *panelp, struct stlport *portp); 469 - static void stl_cd1400setport(struct stlport *portp, struct termios *tiosp); 467 + static void stl_cd1400setport(struct stlport *portp, struct ktermios *tiosp); 470 468 static int stl_cd1400getsignals(struct stlport *portp); 471 469 static void stl_cd1400setsignals(struct stlport *portp, int dtr, int rts); 472 470 static void stl_cd1400ccrwait(struct stlport *portp); ··· 495 493 static int stl_sc26198getglobreg(struct stlport *portp, int regnr); 496 494 static int stl_sc26198panelinit(struct stlbrd *brdp, struct stlpanel *panelp); 497 495 static void stl_sc26198portinit(struct stlbrd *brdp, struct stlpanel *panelp, struct stlport *portp); 498 - static void stl_sc26198setport(struct stlport *portp, struct termios *tiosp); 496 + static void stl_sc26198setport(struct stlport *portp, struct ktermios *tiosp); 499 497 static int stl_sc26198getsignals(struct stlport *portp); 500 498 static void stl_sc26198setsignals(struct stlport *portp, int dtr, int rts); 501 499 static void stl_sc26198enablerxtx(struct stlport *portp, int rx, int tx); ··· 523 521 typedef struct uart { 524 522 int (*panelinit)(struct stlbrd *brdp, struct stlpanel *panelp); 525 523 void (*portinit)(struct stlbrd *brdp, struct stlpanel *panelp, struct stlport *portp); 526 - void (*setport)(struct stlport *portp, struct termios *tiosp); 524 + void (*setport)(struct stlport *portp, struct ktermios *tiosp); 527 525 int (*getsignals)(struct stlport *portp); 528 526 void (*setsignals)(struct stlport *portp, int dtr, int rts); 529 527 void (*enablerxtx)(struct stlport *portp, int rx, int tx); ··· 1429 1427 1430 1428 /*****************************************************************************/ 1431 1429 1432 - static void stl_settermios(struct tty_struct *tty, struct termios *old) 1430 + static void stl_settermios(struct tty_struct *tty, struct ktermios *old) 1433 1431 { 1434 1432 struct stlport *portp; 1435 - struct termios *tiosp; 1433 + struct ktermios *tiosp; 1436 1434 1437 1435 pr_debug("stl_settermios(tty=%p,old=%p)\n", tty, old); 1438 1436 ··· 2470 2468 pr_debug("stl_findpcibrds()\n"); 2471 2469 2472 2470 for (i = 0; (i < stl_nrpcibrds); i++) 2473 - while ((dev = pci_find_device(stl_pcibrds[i].vendid, 2471 + while ((dev = pci_get_device(stl_pcibrds[i].vendid, 2474 2472 stl_pcibrds[i].devid, dev))) { 2475 2473 2476 2474 /* ··· 2949 2947 * settings. 2950 2948 */ 2951 2949 2952 - static void stl_cd1400setport(struct stlport *portp, struct termios *tiosp) 2950 + static void stl_cd1400setport(struct stlport *portp, struct ktermios *tiosp) 2953 2951 { 2954 2952 struct stlbrd *brdp; 2955 2953 unsigned long flags; ··· 3926 3924 * settings. 3927 3925 */ 3928 3926 3929 - static void stl_sc26198setport(struct stlport *portp, struct termios *tiosp) 3927 + static void stl_sc26198setport(struct stlport *portp, struct ktermios *tiosp) 3930 3928 { 3931 3929 struct stlbrd *brdp; 3932 3930 unsigned long flags;
+2
drivers/char/sx.c
··· 2263 2263 sx_driver->init_termios = tty_std_termios; 2264 2264 sx_driver->init_termios.c_cflag = 2265 2265 B9600 | CS8 | CREAD | HUPCL | CLOCAL; 2266 + sx_driver->init_termios.c_ispeed = 9600; 2267 + sx_driver->init_termios.c_ospeed = 9600; 2266 2268 sx_driver->flags = TTY_DRIVER_REAL_RAW; 2267 2269 tty_set_operations(sx_driver, &sx_ops); 2268 2270
+3 -1
drivers/char/synclink.c
··· 3060 3060 * 3061 3061 * Return Value: None 3062 3062 */ 3063 - static void mgsl_set_termios(struct tty_struct *tty, struct termios *old_termios) 3063 + static void mgsl_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 3064 3064 { 3065 3065 struct mgsl_struct *info = (struct mgsl_struct *)tty->driver_data; 3066 3066 unsigned long flags; ··· 4405 4405 serial_driver->init_termios = tty_std_termios; 4406 4406 serial_driver->init_termios.c_cflag = 4407 4407 B9600 | CS8 | CREAD | HUPCL | CLOCAL; 4408 + serial_driver->init_termios.c_ispeed = 9600; 4409 + serial_driver->init_termios.c_ospeed = 9600; 4408 4410 serial_driver->flags = TTY_DRIVER_REAL_RAW; 4409 4411 tty_set_operations(serial_driver, &mgsl_ops); 4410 4412 if ((rc = tty_register_driver(serial_driver)) < 0) {
+4 -2
drivers/char/synclinkmp.c
··· 519 519 static int open(struct tty_struct *tty, struct file * filp); 520 520 static void close(struct tty_struct *tty, struct file * filp); 521 521 static void hangup(struct tty_struct *tty); 522 - static void set_termios(struct tty_struct *tty, struct termios *old_termios); 522 + static void set_termios(struct tty_struct *tty, struct ktermios *old_termios); 523 523 524 524 static int write(struct tty_struct *tty, const unsigned char *buf, int count); 525 525 static void put_char(struct tty_struct *tty, unsigned char ch); ··· 918 918 919 919 /* Set new termios settings 920 920 */ 921 - static void set_termios(struct tty_struct *tty, struct termios *old_termios) 921 + static void set_termios(struct tty_struct *tty, struct ktermios *old_termios) 922 922 { 923 923 SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; 924 924 unsigned long flags; ··· 4034 4034 serial_driver->init_termios = tty_std_termios; 4035 4035 serial_driver->init_termios.c_cflag = 4036 4036 B9600 | CS8 | CREAD | HUPCL | CLOCAL; 4037 + serial_driver->init_termios.c_ispeed = 9600; 4038 + serial_driver->init_termios.c_ospeed = 9600; 4037 4039 serial_driver->flags = TTY_DRIVER_REAL_RAW; 4038 4040 tty_set_operations(serial_driver, &ops); 4039 4041 if ((rc = tty_register_driver(serial_driver)) < 0) {
+2 -2
drivers/char/tty_ioctl.c
··· 495 495 struct sgttyb tmp; 496 496 497 497 mutex_lock(&tty->termios_mutex); 498 - tmp.sg_ispeed = tty->c_ispeed; 499 - tmp.sg_ospeed = tty->c_ospeed; 498 + tmp.sg_ispeed = tty->termios->c_ispeed; 499 + tmp.sg_ospeed = tty->termios->c_ospeed; 500 500 tmp.sg_erase = tty->termios->c_cc[VERASE]; 501 501 tmp.sg_kill = tty->termios->c_cc[VKILL]; 502 502 tmp.sg_flags = get_sgflags(tty);
+2
drivers/char/vme_scc.c
··· 153 153 scc_driver->init_termios = tty_std_termios; 154 154 scc_driver->init_termios.c_cflag = 155 155 B9600 | CS8 | CREAD | HUPCL | CLOCAL; 156 + scc_driver->init_termios.c_ispeed = 9600; 157 + scc_driver->init_termios.c_ospeed = 9600; 156 158 scc_driver->flags = TTY_DRIVER_REAL_RAW; 157 159 tty_set_operations(scc_driver, &scc_ops); 158 160
+1 -1
drivers/isdn/capi/capi.c
··· 1203 1203 return error; 1204 1204 } 1205 1205 1206 - static void capinc_tty_set_termios(struct tty_struct *tty, struct termios * old) 1206 + static void capinc_tty_set_termios(struct tty_struct *tty, struct ktermios * old) 1207 1207 { 1208 1208 #ifdef _DEBUG_TTYFUNCS 1209 1209 printk(KERN_DEBUG "capinc_tty_set_termios\n");
+2 -2
drivers/isdn/gigaset/interface.c
··· 127 127 static int if_chars_in_buffer(struct tty_struct *tty); 128 128 static void if_throttle(struct tty_struct *tty); 129 129 static void if_unthrottle(struct tty_struct *tty); 130 - static void if_set_termios(struct tty_struct *tty, struct termios *old); 130 + static void if_set_termios(struct tty_struct *tty, struct ktermios *old); 131 131 static int if_tiocmget(struct tty_struct *tty, struct file *file); 132 132 static int if_tiocmset(struct tty_struct *tty, struct file *file, 133 133 unsigned int set, unsigned int clear); ··· 490 490 mutex_unlock(&cs->mutex); 491 491 } 492 492 493 - static void if_set_termios(struct tty_struct *tty, struct termios *old) 493 + static void if_set_termios(struct tty_struct *tty, struct ktermios *old) 494 494 { 495 495 struct cardstate *cs; 496 496 unsigned int iflag;
+1 -1
drivers/isdn/i4l/isdn_tty.c
··· 1464 1464 } 1465 1465 1466 1466 static void 1467 - isdn_tty_set_termios(struct tty_struct *tty, struct termios *old_termios) 1467 + isdn_tty_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 1468 1468 { 1469 1469 modem_info *info = (modem_info *) tty->driver_data; 1470 1470
+2 -2
drivers/net/irda/irtty-sir.c
··· 117 117 { 118 118 struct sirtty_cb *priv = dev->priv; 119 119 struct tty_struct *tty; 120 - struct termios old_termios; 120 + struct ktermios old_termios; 121 121 int cflag; 122 122 123 123 IRDA_ASSERT(priv != NULL, return -1;); ··· 318 318 319 319 static inline void irtty_stop_receiver(struct tty_struct *tty, int stop) 320 320 { 321 - struct termios old_termios; 321 + struct ktermios old_termios; 322 322 int cflag; 323 323 324 324 lock_kernel();
-2
drivers/s390/char/sclp_tty.c
··· 60 60 61 61 struct tty_driver *sclp_tty_driver; 62 62 63 - extern struct termios tty_std_termios; 64 - 65 63 static struct sclp_ioctls sclp_ioctls; 66 64 static struct sclp_ioctls sclp_ioctls_init = 67 65 {
+1 -1
drivers/s390/char/tty3270.c
··· 1659 1659 * Check for visible/invisible input switches 1660 1660 */ 1661 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 1664 struct tty3270 *tp; 1665 1665 int new;
+2 -2
drivers/serial/21285.c
··· 214 214 } 215 215 216 216 static void 217 - serial21285_set_termios(struct uart_port *port, struct termios *termios, 218 - struct termios *old) 217 + serial21285_set_termios(struct uart_port *port, struct ktermios *termios, 218 + struct ktermios *old) 219 219 { 220 220 unsigned long flags; 221 221 unsigned int baud, quot, h_lcr;
+1 -1
drivers/serial/68328serial.c
··· 1061 1061 return 0; 1062 1062 } 1063 1063 1064 - static void rs_set_termios(struct tty_struct *tty, struct termios *old_termios) 1064 + static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 1065 1065 { 1066 1066 struct m68k_serial *info = (struct m68k_serial *)tty->driver_data; 1067 1067
+1 -1
drivers/serial/68360serial.c
··· 1523 1523 1524 1524 /* FIX UP modem control here someday...... 1525 1525 */ 1526 - static void rs_360_set_termios(struct tty_struct *tty, struct termios *old_termios) 1526 + static void rs_360_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 1527 1527 { 1528 1528 ser_info_t *info = (ser_info_t *)tty->driver_data; 1529 1529
+2 -2
drivers/serial/8250.c
··· 1763 1763 } 1764 1764 1765 1765 static void 1766 - serial8250_set_termios(struct uart_port *port, struct termios *termios, 1767 - struct termios *old) 1766 + serial8250_set_termios(struct uart_port *port, struct ktermios *termios, 1767 + struct ktermios *old) 1768 1768 { 1769 1769 struct uart_8250_port *up = (struct uart_8250_port *)port; 1770 1770 unsigned char cval, fcr = 0;
+2 -2
drivers/serial/amba-pl010.c
··· 345 345 } 346 346 347 347 static void 348 - pl010_set_termios(struct uart_port *port, struct termios *termios, 349 - struct termios *old) 348 + pl010_set_termios(struct uart_port *port, struct ktermios *termios, 349 + struct ktermios *old) 350 350 { 351 351 unsigned int lcr_h, old_cr; 352 352 unsigned long flags;
+2 -2
drivers/serial/amba-pl011.c
··· 412 412 } 413 413 414 414 static void 415 - pl011_set_termios(struct uart_port *port, struct termios *termios, 416 - struct termios *old) 415 + pl011_set_termios(struct uart_port *port, struct ktermios *termios, 416 + struct ktermios *old) 417 417 { 418 418 unsigned int lcr_h, old_cr; 419 419 unsigned long flags;
+1 -1
drivers/serial/atmel_serial.c
··· 478 478 /* 479 479 * Change the port parameters 480 480 */ 481 - static void atmel_set_termios(struct uart_port *port, struct termios * termios, struct termios * old) 481 + static void atmel_set_termios(struct uart_port *port, struct ktermios * termios, struct ktermios * old) 482 482 { 483 483 unsigned long flags; 484 484 unsigned int mode, imr, quot, baud;
+2 -2
drivers/serial/clps711x.c
··· 286 286 } 287 287 288 288 static void 289 - clps711xuart_set_termios(struct uart_port *port, struct termios *termios, 290 - struct termios *old) 289 + clps711xuart_set_termios(struct uart_port *port, struct ktermios *termios, 290 + struct ktermios *old) 291 291 { 292 292 unsigned int ubrlcr, baud, quot; 293 293 unsigned long flags;
+5 -3
drivers/serial/crisv10.c
··· 804 804 805 805 #define NR_PORTS (sizeof(rs_table)/sizeof(struct e100_serial)) 806 806 807 - static struct termios *serial_termios[NR_PORTS]; 808 - static struct termios *serial_termios_locked[NR_PORTS]; 807 + static struct ktermios *serial_termios[NR_PORTS]; 808 + static struct ktermios *serial_termios_locked[NR_PORTS]; 809 809 #ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER 810 810 static struct fast_timer fast_timers[NR_PORTS]; 811 811 #endif ··· 4223 4223 } 4224 4224 4225 4225 static void 4226 - rs_set_termios(struct tty_struct *tty, struct termios *old_termios) 4226 + rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 4227 4227 { 4228 4228 struct e100_serial *info = (struct e100_serial *)tty->driver_data; 4229 4229 ··· 4877 4877 driver->init_termios = tty_std_termios; 4878 4878 driver->init_termios.c_cflag = 4879 4879 B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */ 4880 + driver->init_termios.c_ispeed = 115200; 4881 + driver->init_termios.c_ospeed = 115200; 4880 4882 driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 4881 4883 driver->termios = serial_termios; 4882 4884 driver->termios_locked = serial_termios_locked;
+2 -2
drivers/serial/crisv10.h
··· 93 93 94 94 struct work_struct work; 95 95 struct async_icount icount; /* error-statistics etc.*/ 96 - struct termios normal_termios; 97 - struct termios callout_termios; 96 + struct ktermios normal_termios; 97 + struct ktermios callout_termios; 98 98 #ifdef DECLARE_WAITQUEUE 99 99 wait_queue_head_t open_wait; 100 100 wait_queue_head_t close_wait;
+2 -2
drivers/serial/dz.c
··· 461 461 spin_unlock_irqrestore(&uport->lock, flags); 462 462 } 463 463 464 - static void dz_set_termios(struct uart_port *uport, struct termios *termios, 465 - struct termios *old_termios) 464 + static void dz_set_termios(struct uart_port *uport, struct ktermios *termios, 465 + struct ktermios *old_termios) 466 466 { 467 467 struct dz_port *dport = (struct dz_port *)uport; 468 468 unsigned long flags;
+2 -2
drivers/serial/icom.c
··· 1087 1087 } 1088 1088 1089 1089 static void icom_set_termios(struct uart_port *port, 1090 - struct termios *termios, 1091 - struct termios *old_termios) 1090 + struct ktermios *termios, 1091 + struct ktermios *old_termios) 1092 1092 { 1093 1093 int baud; 1094 1094 unsigned cflag, iflag;
+2 -2
drivers/serial/imx.c
··· 459 459 } 460 460 461 461 static void 462 - imx_set_termios(struct uart_port *port, struct termios *termios, 463 - struct termios *old) 462 + imx_set_termios(struct uart_port *port, struct ktermios *termios, 463 + struct ktermios *old) 464 464 { 465 465 struct imx_port *sport = (struct imx_port *)port; 466 466 unsigned long flags;
+2 -2
drivers/serial/ioc3_serial.c
··· 950 950 */ 951 951 static void 952 952 ioc3_change_speed(struct uart_port *the_port, 953 - struct termios *new_termios, struct termios *old_termios) 953 + struct ktermios *new_termios, struct ktermios *old_termios) 954 954 { 955 955 struct ioc3_port *port = get_ioc3_port(the_port); 956 956 unsigned int cflag; ··· 1853 1853 */ 1854 1854 static void 1855 1855 ic3_set_termios(struct uart_port *the_port, 1856 - struct termios *termios, struct termios *old_termios) 1856 + struct ktermios *termios, struct ktermios *old_termios) 1857 1857 { 1858 1858 unsigned long port_flags; 1859 1859
+3 -3
drivers/serial/ioc4_serial.c
··· 1681 1681 */ 1682 1682 static void 1683 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 1686 struct ioc4_port *port = get_ioc4_port(the_port, 0); 1687 1687 int baud, bits; ··· 1802 1802 ioc4_set_proto(port, the_port->mapbase); 1803 1803 1804 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 1807 return 0; 1808 1808 } ··· 2570 2570 */ 2571 2571 static void 2572 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 2575 unsigned long port_flags; 2576 2576
+2 -2
drivers/serial/ip22zilog.c
··· 840 840 841 841 /* The port lock is not held. */ 842 842 static void 843 - ip22zilog_set_termios(struct uart_port *port, struct termios *termios, 844 - struct termios *old) 843 + ip22zilog_set_termios(struct uart_port *port, struct ktermios *termios, 844 + struct ktermios *old) 845 845 { 846 846 struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port; 847 847 unsigned long flags;
+5 -5
drivers/serial/jsm/jsm_tty.c
··· 142 142 { 143 143 unsigned long lock_flags; 144 144 struct jsm_channel *channel = (struct jsm_channel *)port; 145 - struct termios *termios; 145 + struct ktermios *termios; 146 146 147 147 spin_lock_irqsave(&port->lock, lock_flags); 148 148 termios = port->info->tty->termios; ··· 180 180 struct jsm_board *brd; 181 181 int rc = 0; 182 182 struct jsm_channel *channel = (struct jsm_channel *)port; 183 - struct termios *termios; 183 + struct ktermios *termios; 184 184 185 185 /* Get board pointer from our array of majors we have allocated */ 186 186 brd = channel->ch_bd; ··· 269 269 static void jsm_tty_close(struct uart_port *port) 270 270 { 271 271 struct jsm_board *bd; 272 - struct termios *ts; 272 + struct ktermios *ts; 273 273 struct jsm_channel *channel = (struct jsm_channel *)port; 274 274 275 275 jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev, "start\n"); ··· 302 302 } 303 303 304 304 static void jsm_tty_set_termios(struct uart_port *port, 305 - struct termios *termios, 306 - struct termios *old_termios) 305 + struct ktermios *termios, 306 + struct ktermios *old_termios) 307 307 { 308 308 unsigned long lock_flags; 309 309 struct jsm_channel *channel = (struct jsm_channel *)port;
+1 -1
drivers/serial/m32r_sio.c
··· 699 699 } 700 700 701 701 static void m32r_sio_set_termios(struct uart_port *port, 702 - struct termios *termios, struct termios *old) 702 + struct ktermios *termios, struct ktermios *old) 703 703 { 704 704 struct uart_sio_port *up = (struct uart_sio_port *)port; 705 705 unsigned char cval = 0;
+1 -1
drivers/serial/mcfserial.c
··· 1132 1132 return 0; 1133 1133 } 1134 1134 1135 - static void mcfrs_set_termios(struct tty_struct *tty, struct termios *old_termios) 1135 + static void mcfrs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 1136 1136 { 1137 1137 struct mcf_serial *info = (struct mcf_serial *)tty->driver_data; 1138 1138
+2 -2
drivers/serial/mpc52xx_uart.c
··· 270 270 } 271 271 272 272 static void 273 - mpc52xx_uart_set_termios(struct uart_port *port, struct termios *new, 274 - struct termios *old) 273 + mpc52xx_uart_set_termios(struct uart_port *port, struct ktermios *new, 274 + struct ktermios *old) 275 275 { 276 276 struct mpc52xx_psc __iomem *psc = PSC(port); 277 277 unsigned long flags;
+2 -2
drivers/serial/mpsc.c
··· 1440 1440 } 1441 1441 1442 1442 static void 1443 - mpsc_set_termios(struct uart_port *port, struct termios *termios, 1444 - struct termios *old) 1443 + mpsc_set_termios(struct uart_port *port, struct ktermios *termios, 1444 + struct ktermios *old) 1445 1445 { 1446 1446 struct mpsc_port_info *pi = (struct mpsc_port_info *)port; 1447 1447 u32 baud;
+2 -2
drivers/serial/mux.c
··· 273 273 * The Serial Mux does not support this function. 274 274 */ 275 275 static void 276 - mux_set_termios(struct uart_port *port, struct termios *termios, 277 - struct termios *old) 276 + mux_set_termios(struct uart_port *port, struct ktermios *termios, 277 + struct ktermios *old) 278 278 { 279 279 } 280 280
+2 -2
drivers/serial/netx-serial.c
··· 337 337 } 338 338 339 339 static void 340 - netx_set_termios(struct uart_port *port, struct termios *termios, 341 - struct termios *old) 340 + netx_set_termios(struct uart_port *port, struct ktermios *termios, 341 + struct ktermios *old) 342 342 { 343 343 unsigned int baud, quot; 344 344 unsigned char old_cr;
+5 -5
drivers/serial/pmac_zilog.c
··· 1262 1262 } 1263 1263 1264 1264 1265 - static void __pmz_set_termios(struct uart_port *port, struct termios *termios, 1266 - struct termios *old) 1265 + static void __pmz_set_termios(struct uart_port *port, struct ktermios *termios, 1266 + struct ktermios *old) 1267 1267 { 1268 1268 struct uart_pmac_port *uap = to_pmz(port); 1269 1269 unsigned long baud; ··· 1273 1273 if (ZS_IS_ASLEEP(uap)) 1274 1274 return; 1275 1275 1276 - memcpy(&uap->termios_cache, termios, sizeof(struct termios)); 1276 + memcpy(&uap->termios_cache, termios, sizeof(struct ktermios)); 1277 1277 1278 1278 /* XXX Check which revs of machines actually allow 1 and 4Mb speeds 1279 1279 * on the IR dongle. Note that the IRTTY driver currently doesn't know ··· 1313 1313 } 1314 1314 1315 1315 /* The port lock is not held. */ 1316 - static void pmz_set_termios(struct uart_port *port, struct termios *termios, 1317 - struct termios *old) 1316 + static void pmz_set_termios(struct uart_port *port, struct ktermios *termios, 1317 + struct ktermios *old) 1318 1318 { 1319 1319 struct uart_pmac_port *uap = to_pmz(port); 1320 1320 unsigned long flags;
+1 -1
drivers/serial/pmac_zilog.h
··· 60 60 volatile struct dbdma_regs __iomem *tx_dma_regs; 61 61 volatile struct dbdma_regs __iomem *rx_dma_regs; 62 62 63 - struct termios termios_cache; 63 + struct ktermios termios_cache; 64 64 }; 65 65 66 66 #define to_pmz(p) ((struct uart_pmac_port *)(p))
+2 -2
drivers/serial/pxa.c
··· 433 433 } 434 434 435 435 static void 436 - serial_pxa_set_termios(struct uart_port *port, struct termios *termios, 437 - struct termios *old) 436 + serial_pxa_set_termios(struct uart_port *port, struct ktermios *termios, 437 + struct ktermios *old) 438 438 { 439 439 struct uart_pxa_port *up = (struct uart_pxa_port *)port; 440 440 unsigned char cval, fcr = 0;
+2 -2
drivers/serial/s3c2410.c
··· 738 738 } 739 739 740 740 static void s3c24xx_serial_set_termios(struct uart_port *port, 741 - struct termios *termios, 742 - struct termios *old) 741 + struct ktermios *termios, 742 + struct ktermios *old) 743 743 { 744 744 struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port); 745 745 struct s3c24xx_uart_port *ourport = to_ourport(port);
+2 -2
drivers/serial/sa1100.c
··· 408 408 } 409 409 410 410 static void 411 - sa1100_set_termios(struct uart_port *port, struct termios *termios, 412 - struct termios *old) 411 + sa1100_set_termios(struct uart_port *port, struct ktermios *termios, 412 + struct ktermios *old) 413 413 { 414 414 struct sa1100_port *sport = (struct sa1100_port *)port; 415 415 unsigned long flags;
+11 -10
drivers/serial/serial_core.c
··· 65 65 #define uart_console(port) (0) 66 66 #endif 67 67 68 - static void uart_change_speed(struct uart_state *state, struct termios *old_termios); 68 + static void uart_change_speed(struct uart_state *state, struct ktermios *old_termios); 69 69 static void uart_wait_until_sent(struct tty_struct *tty, int timeout); 70 70 static void uart_change_pm(struct uart_state *state, int pm_state); 71 71 ··· 338 338 * we're actually going to be using. 339 339 */ 340 340 unsigned int 341 - uart_get_baud_rate(struct uart_port *port, struct termios *termios, 342 - struct termios *old, unsigned int min, unsigned int max) 341 + uart_get_baud_rate(struct uart_port *port, struct ktermios *termios, 342 + struct ktermios *old, unsigned int min, unsigned int max) 343 343 { 344 344 unsigned int try, baud, altbaud = 38400; 345 345 upf_t flags = port->flags & UPF_SPD_MASK; ··· 421 421 EXPORT_SYMBOL(uart_get_divisor); 422 422 423 423 static void 424 - uart_change_speed(struct uart_state *state, struct termios *old_termios) 424 + uart_change_speed(struct uart_state *state, struct ktermios *old_termios) 425 425 { 426 426 struct tty_struct *tty = state->info->tty; 427 427 struct uart_port *port = state->port; 428 - struct termios *termios; 428 + struct ktermios *termios; 429 429 430 430 /* 431 431 * If we have no tty, termios, or the port does not exist, ··· 1139 1139 return ret; 1140 1140 } 1141 1141 1142 - static void uart_set_termios(struct tty_struct *tty, struct termios *old_termios) 1142 + static void uart_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 1143 1143 { 1144 1144 struct uart_state *state = tty->driver_data; 1145 1145 unsigned long flags; ··· 1866 1866 uart_set_options(struct uart_port *port, struct console *co, 1867 1867 int baud, int parity, int bits, int flow) 1868 1868 { 1869 - struct termios termios; 1869 + struct ktermios termios; 1870 1870 int i; 1871 1871 1872 1872 /* ··· 1876 1876 spin_lock_init(&port->lock); 1877 1877 lockdep_set_class(&port->lock, &port_lock_key); 1878 1878 1879 - memset(&termios, 0, sizeof(struct termios)); 1879 + memset(&termios, 0, sizeof(struct ktermios)); 1880 1880 1881 1881 termios.c_cflag = CREAD | HUPCL | CLOCAL; 1882 1882 ··· 1991 1991 * Re-enable the console device after suspending. 1992 1992 */ 1993 1993 if (uart_console(port)) { 1994 - struct termios termios; 1994 + struct ktermios termios; 1995 1995 1996 1996 /* 1997 1997 * First try to use the console cflag setting. 1998 1998 */ 1999 - memset(&termios, 0, sizeof(struct termios)); 1999 + memset(&termios, 0, sizeof(struct ktermios)); 2000 2000 termios.c_cflag = port->cons->cflag; 2001 2001 2002 2002 /* ··· 2189 2189 normal->subtype = SERIAL_TYPE_NORMAL; 2190 2190 normal->init_termios = tty_std_termios; 2191 2191 normal->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; 2192 + normal->init_termios.c_ispeed = normal->init_termios.c_ospeed = 9600; 2192 2193 normal->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 2193 2194 normal->driver_state = drv; 2194 2195 tty_set_operations(normal, &uart_ops);
+2 -2
drivers/serial/serial_lh7a40x.c
··· 348 348 } 349 349 350 350 static void lh7a40xuart_set_termios (struct uart_port* port, 351 - struct termios* termios, 352 - struct termios* old) 351 + struct ktermios* termios, 352 + struct ktermios* old) 353 353 { 354 354 unsigned int con; 355 355 unsigned int inten;
+2 -2
drivers/serial/serial_txx9.c
··· 556 556 } 557 557 558 558 static void 559 - serial_txx9_set_termios(struct uart_port *port, struct termios *termios, 560 - struct termios *old) 559 + serial_txx9_set_termios(struct uart_port *port, struct ktermios *termios, 560 + struct ktermios *old) 561 561 { 562 562 struct uart_txx9_port *up = (struct uart_txx9_port *)port; 563 563 unsigned int cval, fcr = 0;
+2 -2
drivers/serial/sh-sci.c
··· 943 943 s->disable(port); 944 944 } 945 945 946 - static void sci_set_termios(struct uart_port *port, struct termios *termios, 947 - struct termios *old) 946 + static void sci_set_termios(struct uart_port *port, struct ktermios *termios, 947 + struct ktermios *old) 948 948 { 949 949 struct sci_port *s = &sci_ports[port->line]; 950 950 unsigned int status, baud, smr_val;
+2 -2
drivers/serial/sn_console.c
··· 361 361 * 362 362 */ 363 363 static void 364 - snp_set_termios(struct uart_port *port, struct termios *termios, 365 - struct termios *old) 364 + snp_set_termios(struct uart_port *port, struct ktermios *termios, 365 + struct ktermios *old) 366 366 { 367 367 } 368 368
+2 -2
drivers/serial/sunhv.c
··· 281 281 } 282 282 283 283 /* port->lock is not held. */ 284 - static void sunhv_set_termios(struct uart_port *port, struct termios *termios, 285 - struct termios *old) 284 + static void sunhv_set_termios(struct uart_port *port, struct ktermios *termios, 285 + struct ktermios *old) 286 286 { 287 287 unsigned int baud = uart_get_baud_rate(port, termios, old, 0, 4000000); 288 288 unsigned int quot = uart_get_divisor(port, baud);
+2 -2
drivers/serial/sunsab.c
··· 786 786 } 787 787 788 788 /* port->lock is not held. */ 789 - static void sunsab_set_termios(struct uart_port *port, struct termios *termios, 790 - struct termios *old) 789 + static void sunsab_set_termios(struct uart_port *port, struct ktermios *termios, 790 + struct ktermios *old) 791 791 { 792 792 struct uart_sunsab_port *up = (struct uart_sunsab_port *) port; 793 793 unsigned long flags;
+2 -2
drivers/serial/sunsu.c
··· 893 893 } 894 894 895 895 static void 896 - sunsu_set_termios(struct uart_port *port, struct termios *termios, 897 - struct termios *old) 896 + sunsu_set_termios(struct uart_port *port, struct ktermios *termios, 897 + struct ktermios *old) 898 898 { 899 899 unsigned int baud, quot; 900 900
+2 -2
drivers/serial/sunzilog.c
··· 922 922 923 923 /* The port lock is not held. */ 924 924 static void 925 - sunzilog_set_termios(struct uart_port *port, struct termios *termios, 926 - struct termios *old) 925 + sunzilog_set_termios(struct uart_port *port, struct ktermios *termios, 926 + struct ktermios *old) 927 927 { 928 928 struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port; 929 929 unsigned long flags;
+2 -2
drivers/serial/uartlite.c
··· 214 214 free_irq(port->irq, port); 215 215 } 216 216 217 - static void ulite_set_termios(struct uart_port *port, struct termios *termios, 218 - struct termios *old) 217 + static void ulite_set_termios(struct uart_port *port, struct ktermios *termios, 218 + struct ktermios *old) 219 219 { 220 220 unsigned long flags; 221 221 unsigned int baud;
+2 -2
drivers/serial/v850e_uart.c
··· 404 404 } 405 405 406 406 static void 407 - v850e_uart_set_termios (struct uart_port *port, struct termios *termios, 408 - struct termios *old) 407 + v850e_uart_set_termios (struct uart_port *port, struct ktermios *termios, 408 + struct ktermios *old) 409 409 { 410 410 unsigned cflags = termios->c_cflag; 411 411
+2 -2
drivers/serial/vr41xx_siu.c
··· 562 562 free_irq(port->irq, port); 563 563 } 564 564 565 - static void siu_set_termios(struct uart_port *port, struct termios *new, 566 - struct termios *old) 565 + static void siu_set_termios(struct uart_port *port, struct ktermios *new, 566 + struct ktermios *old) 567 567 { 568 568 tcflag_t c_cflag, c_iflag; 569 569 uint8_t lcr, fcr, ier;
+1 -1
drivers/tc/zs.c
··· 1238 1238 return 0; 1239 1239 } 1240 1240 1241 - static void rs_set_termios(struct tty_struct *tty, struct termios *old_termios) 1241 + static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 1242 1242 { 1243 1243 struct dec_serial *info = (struct dec_serial *)tty->driver_data; 1244 1244 int was_stopped;
+2 -2
drivers/usb/class/cdc-acm.c
··· 677 677 5, 6, 7, 8 678 678 }; 679 679 680 - static void acm_tty_set_termios(struct tty_struct *tty, struct termios *termios_old) 680 + static void acm_tty_set_termios(struct tty_struct *tty, struct ktermios *termios_old) 681 681 { 682 682 struct acm *acm = tty->driver_data; 683 - struct termios *termios = tty->termios; 683 + struct ktermios *termios = tty->termios; 684 684 struct usb_cdc_line_coding newline; 685 685 int newctrl = acm->ctrlout; 686 686
+2 -2
drivers/usb/gadget/serial.c
··· 200 200 static void gs_break(struct tty_struct *tty, int break_state); 201 201 static int gs_ioctl(struct tty_struct *tty, struct file *file, 202 202 unsigned int cmd, unsigned long arg); 203 - static void gs_set_termios(struct tty_struct *tty, struct termios *old); 203 + static void gs_set_termios(struct tty_struct *tty, struct ktermios *old); 204 204 205 205 static int gs_send(struct gs_dev *dev); 206 206 static int gs_send_packet(struct gs_dev *dev, char *packet, ··· 1077 1077 /* 1078 1078 * gs_set_termios 1079 1079 */ 1080 - static void gs_set_termios(struct tty_struct *tty, struct termios *old) 1080 + static void gs_set_termios(struct tty_struct *tty, struct ktermios *old) 1081 1081 { 1082 1082 } 1083 1083
+2 -2
drivers/usb/serial/ark3116.c
··· 156 156 } 157 157 158 158 static void ark3116_set_termios(struct usb_serial_port *port, 159 - struct termios *old_termios) 159 + struct ktermios *old_termios) 160 160 { 161 161 struct usb_serial *serial = port->serial; 162 162 struct ark3116_private *priv = usb_get_serial_port_data(port); ··· 326 326 327 327 static int ark3116_open(struct usb_serial_port *port, struct file *filp) 328 328 { 329 - struct termios tmp_termios; 329 + struct ktermios tmp_termios; 330 330 struct usb_serial *serial = port->serial; 331 331 char *buf; 332 332 int result = 0;
+2 -2
drivers/usb/serial/belkin_sa.c
··· 92 92 static int belkin_sa_open (struct usb_serial_port *port, struct file *filp); 93 93 static void belkin_sa_close (struct usb_serial_port *port, struct file *filp); 94 94 static void belkin_sa_read_int_callback (struct urb *urb); 95 - static void belkin_sa_set_termios (struct usb_serial_port *port, struct termios * old); 95 + static void belkin_sa_set_termios (struct usb_serial_port *port, struct ktermios * old); 96 96 static int belkin_sa_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg); 97 97 static void belkin_sa_break_ctl (struct usb_serial_port *port, int break_state ); 98 98 static int belkin_sa_tiocmget (struct usb_serial_port *port, struct file *file); ··· 333 333 __FUNCTION__, retval); 334 334 } 335 335 336 - static void belkin_sa_set_termios (struct usb_serial_port *port, struct termios *old_termios) 336 + static void belkin_sa_set_termios (struct usb_serial_port *port, struct ktermios *old_termios) 337 337 { 338 338 struct usb_serial *serial = port->serial; 339 339 struct belkin_sa_private *priv = usb_get_serial_port_data(port);
+1 -1
drivers/usb/serial/console.c
··· 65 65 struct usb_serial_port *port; 66 66 int retval = 0; 67 67 struct tty_struct *tty; 68 - struct termios *termios; 68 + struct ktermios *termios; 69 69 70 70 dbg ("%s", __FUNCTION__); 71 71
+2 -2
drivers/usb/serial/cp2101.c
··· 41 41 static void cp2101_cleanup(struct usb_serial_port*); 42 42 static void cp2101_close(struct usb_serial_port*, struct file*); 43 43 static void cp2101_get_termios(struct usb_serial_port*); 44 - static void cp2101_set_termios(struct usb_serial_port*, struct termios*); 44 + static void cp2101_set_termios(struct usb_serial_port*, struct ktermios*); 45 45 static int cp2101_tiocmget (struct usb_serial_port *, struct file *); 46 46 static int cp2101_tiocmset (struct usb_serial_port *, struct file *, 47 47 unsigned int, unsigned int); ··· 506 506 } 507 507 508 508 static void cp2101_set_termios (struct usb_serial_port *port, 509 - struct termios *old_termios) 509 + struct ktermios *old_termios) 510 510 { 511 511 unsigned int cflag, old_cflag=0; 512 512 int baud=0, bits;
+5 -5
drivers/usb/serial/cypress_m8.c
··· 143 143 wait_queue_head_t delta_msr_wait; /* used for TIOCMIWAIT */ 144 144 char prev_status, diff_status; /* used for TIOCMIWAIT */ 145 145 /* we pass a pointer to this as the arguement sent to cypress_set_termios old_termios */ 146 - struct termios tmp_termios; /* stores the old termios settings */ 146 + struct ktermios tmp_termios; /* stores the old termios settings */ 147 147 }; 148 148 149 149 /* write buffer structure */ ··· 165 165 static void cypress_send (struct usb_serial_port *port); 166 166 static int cypress_write_room (struct usb_serial_port *port); 167 167 static int cypress_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg); 168 - static void cypress_set_termios (struct usb_serial_port *port, struct termios * old); 168 + static void cypress_set_termios (struct usb_serial_port *port, struct ktermios * old); 169 169 static int cypress_tiocmget (struct usb_serial_port *port, struct file *file); 170 170 static int cypress_tiocmset (struct usb_serial_port *port, struct file *file, unsigned int set, unsigned int clear); 171 171 static int cypress_chars_in_buffer (struct usb_serial_port *port); ··· 949 949 950 950 switch (cmd) { 951 951 case TIOCGSERIAL: 952 - if (copy_to_user((void __user *)arg, port->tty->termios, sizeof(struct termios))) { 952 + if (copy_to_user((void __user *)arg, port->tty->termios, sizeof(struct ktermios))) { 953 953 return -EFAULT; 954 954 } 955 955 return (0); 956 956 break; 957 957 case TIOCSSERIAL: 958 - if (copy_from_user(port->tty->termios, (void __user *)arg, sizeof(struct termios))) { 958 + if (copy_from_user(port->tty->termios, (void __user *)arg, sizeof(struct ktermios))) { 959 959 return -EFAULT; 960 960 } 961 961 /* here we need to call cypress_set_termios to invoke the new settings */ ··· 1019 1019 1020 1020 1021 1021 static void cypress_set_termios (struct usb_serial_port *port, 1022 - struct termios *old_termios) 1022 + struct ktermios *old_termios) 1023 1023 { 1024 1024 struct cypress_private *priv = usb_get_serial_port_data(port); 1025 1025 struct tty_struct *tty;
+3 -3
drivers/usb/serial/digi_acceleport.c
··· 449 449 static void digi_rx_throttle (struct usb_serial_port *port); 450 450 static void digi_rx_unthrottle (struct usb_serial_port *port); 451 451 static void digi_set_termios( struct usb_serial_port *port, 452 - struct termios *old_termios ); 452 + struct ktermios *old_termios ); 453 453 static void digi_break_ctl( struct usb_serial_port *port, int break_state ); 454 454 static int digi_ioctl( struct usb_serial_port *port, struct file *file, 455 455 unsigned int cmd, unsigned long arg ); ··· 976 976 977 977 978 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 982 struct digi_port *priv = usb_get_serial_port_data(port); ··· 1463 1463 int ret; 1464 1464 unsigned char buf[32]; 1465 1465 struct digi_port *priv = usb_get_serial_port_data(port); 1466 - struct termios not_termios; 1466 + struct ktermios not_termios; 1467 1467 unsigned long flags = 0; 1468 1468 1469 1469
+2 -2
drivers/usb/serial/empeg.c
··· 92 92 struct file * file, 93 93 unsigned int cmd, 94 94 unsigned long arg); 95 - static void empeg_set_termios (struct usb_serial_port *port, struct termios *old_termios); 95 + static void empeg_set_termios (struct usb_serial_port *port, struct ktermios *old_termios); 96 96 static void empeg_write_bulk_callback (struct urb *urb); 97 97 static void empeg_read_bulk_callback (struct urb *urb); 98 98 ··· 442 442 } 443 443 444 444 445 - static void empeg_set_termios (struct usb_serial_port *port, struct termios *old_termios) 445 + static void empeg_set_termios (struct usb_serial_port *port, struct ktermios *old_termios) 446 446 { 447 447 448 448 dbg("%s - port %d", __FUNCTION__, port->number);
+2 -2
drivers/usb/serial/ftdi_sio.c
··· 595 595 static void ftdi_write_bulk_callback (struct urb *urb); 596 596 static void ftdi_read_bulk_callback (struct urb *urb); 597 597 static void ftdi_process_read (struct work_struct *work); 598 - static void ftdi_set_termios (struct usb_serial_port *port, struct termios * old); 598 + static void ftdi_set_termios (struct usb_serial_port *port, struct ktermios * old); 599 599 static int ftdi_tiocmget (struct usb_serial_port *port, struct file *file); 600 600 static int ftdi_tiocmset (struct usb_serial_port *port, struct file * file, unsigned int set, unsigned int clear); 601 601 static int ftdi_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg); ··· 1880 1880 * WARNING: set_termios calls this with old_termios in kernel space 1881 1881 */ 1882 1882 1883 - static void ftdi_set_termios (struct usb_serial_port *port, struct termios *old_termios) 1883 + static void ftdi_set_termios (struct usb_serial_port *port, struct ktermios *old_termios) 1884 1884 { /* ftdi_termios */ 1885 1885 struct usb_device *dev = port->serial->dev; 1886 1886 unsigned int cflag = port->tty->termios->c_cflag;
+4 -4
drivers/usb/serial/io_edgeport.c
··· 229 229 static int edge_chars_in_buffer (struct usb_serial_port *port); 230 230 static void edge_throttle (struct usb_serial_port *port); 231 231 static void edge_unthrottle (struct usb_serial_port *port); 232 - static void edge_set_termios (struct usb_serial_port *port, struct termios *old_termios); 232 + static void edge_set_termios (struct usb_serial_port *port, struct ktermios *old_termios); 233 233 static int edge_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg); 234 234 static void edge_break (struct usb_serial_port *port, int break_state); 235 235 static int edge_tiocmget (struct usb_serial_port *port, struct file *file); ··· 257 257 static int send_iosp_ext_cmd (struct edgeport_port *edge_port, __u8 command, __u8 param); 258 258 static int calc_baud_rate_divisor (int baud_rate, int *divisor); 259 259 static int send_cmd_write_baud_rate (struct edgeport_port *edge_port, int baudRate); 260 - static void change_port_settings (struct edgeport_port *edge_port, struct termios *old_termios); 260 + static void change_port_settings (struct edgeport_port *edge_port, struct ktermios *old_termios); 261 261 static int send_cmd_write_uart_register (struct edgeport_port *edge_port, __u8 regNum, __u8 regValue); 262 262 static int write_cmd_usb (struct edgeport_port *edge_port, unsigned char *buffer, int writeLength); 263 263 static void send_more_port_data (struct edgeport_serial *edge_serial, struct edgeport_port *edge_port); ··· 1431 1431 * SerialSetTermios 1432 1432 * this function is called by the tty driver when it wants to change the termios structure 1433 1433 *****************************************************************************/ 1434 - static void edge_set_termios (struct usb_serial_port *port, struct termios *old_termios) 1434 + static void edge_set_termios (struct usb_serial_port *port, struct ktermios *old_termios) 1435 1435 { 1436 1436 struct edgeport_port *edge_port = usb_get_serial_port_data(port); 1437 1437 struct tty_struct *tty = port->tty; ··· 2412 2412 #ifndef CMSPAR 2413 2413 #define CMSPAR 0 2414 2414 #endif 2415 - static void change_port_settings (struct edgeport_port *edge_port, struct termios *old_termios) 2415 + static void change_port_settings (struct edgeport_port *edge_port, struct ktermios *old_termios) 2416 2416 { 2417 2417 struct tty_struct *tty; 2418 2418 int baud;
+3 -3
drivers/usb/serial/io_ti.c
··· 238 238 static void stop_read(struct edgeport_port *edge_port); 239 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 242 static void edge_send(struct usb_serial_port *port); 243 243 244 244 /* circular buffer */ ··· 2361 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 2366 struct ump_uart_config *config; 2367 2367 struct tty_struct *tty; ··· 2512 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 2517 struct edgeport_port *edge_port = usb_get_serial_port_data(port); 2518 2518 struct tty_struct *tty = port->tty;
+2 -2
drivers/usb/serial/ir-usb.c
··· 107 107 static int ir_write (struct usb_serial_port *port, const unsigned char *buf, int count); 108 108 static void ir_write_bulk_callback (struct urb *urb); 109 109 static void ir_read_bulk_callback (struct urb *urb); 110 - static void ir_set_termios (struct usb_serial_port *port, struct termios *old_termios); 110 + static void ir_set_termios (struct usb_serial_port *port, struct ktermios *old_termios); 111 111 112 112 static u8 ir_baud = 0; 113 113 static u8 ir_xbof = 0; ··· 497 497 return; 498 498 } 499 499 500 - static void ir_set_termios (struct usb_serial_port *port, struct termios *old_termios) 500 + static void ir_set_termios (struct usb_serial_port *port, struct ktermios *old_termios) 501 501 { 502 502 unsigned char *transfer_buffer; 503 503 unsigned int cflag;
+1 -1
drivers/usb/serial/keyspan.c
··· 264 264 265 265 266 266 static void keyspan_set_termios (struct usb_serial_port *port, 267 - struct termios *old_termios) 267 + struct ktermios *old_termios) 268 268 { 269 269 int baud_rate, device_port; 270 270 struct keyspan_port_private *p_priv;
+1 -1
drivers/usb/serial/keyspan.h
··· 59 59 unsigned int cmd, 60 60 unsigned long arg); 61 61 static void keyspan_set_termios (struct usb_serial_port *port, 62 - struct termios *old); 62 + struct ktermios *old); 63 63 static void keyspan_break_ctl (struct usb_serial_port *port, 64 64 int break_state); 65 65 static int keyspan_tiocmget (struct usb_serial_port *port,
+1 -1
drivers/usb/serial/keyspan_pda.c
··· 365 365 366 366 367 367 static void keyspan_pda_set_termios (struct usb_serial_port *port, 368 - struct termios *old_termios) 368 + struct ktermios *old_termios) 369 369 { 370 370 struct usb_serial *serial = port->serial; 371 371 unsigned int cflag = port->tty->termios->c_cflag;
+3 -3
drivers/usb/serial/kl5kusb105.c
··· 86 86 87 87 static void klsi_105_read_bulk_callback (struct urb *urb); 88 88 static void klsi_105_set_termios (struct usb_serial_port *port, 89 - struct termios * old); 89 + struct ktermios *old); 90 90 static int klsi_105_ioctl (struct usb_serial_port *port, 91 91 struct file * file, 92 92 unsigned int cmd, ··· 164 164 #define URB_TRANSFER_BUFFER_SIZE 64 165 165 struct klsi_105_private { 166 166 struct klsi_105_port_settings cfg; 167 - struct termios termios; 167 + struct ktermios termios; 168 168 unsigned long line_state; /* modem line settings */ 169 169 /* write pool */ 170 170 struct urb * write_urb_pool[NUM_URBS]; ··· 688 688 689 689 690 690 static void klsi_105_set_termios (struct usb_serial_port *port, 691 - struct termios *old_termios) 691 + struct ktermios *old_termios) 692 692 { 693 693 struct klsi_105_private *priv = usb_get_serial_port_data(port); 694 694 unsigned int iflag = port->tty->termios->c_iflag;
+5 -5
drivers/usb/serial/kobil_sct.c
··· 136 136 int cur_pos; // index of the next char to send in buf 137 137 __u16 device_type; 138 138 int line_state; 139 - struct termios internal_termios; 139 + struct ktermios internal_termios; 140 140 }; 141 141 142 142 ··· 624 624 625 625 switch (cmd) { 626 626 case TCGETS: // 0x5401 627 - if (!access_ok(VERIFY_WRITE, user_arg, sizeof(struct termios))) { 627 + if (!access_ok(VERIFY_WRITE, user_arg, sizeof(struct ktermios))) { 628 628 dbg("%s - port %d Error in access_ok", __FUNCTION__, port->number); 629 629 return -EFAULT; 630 630 } 631 - if (kernel_termios_to_user_termios((struct termios __user *)arg, 631 + if (kernel_termios_to_user_termios((struct ktermios __user *)arg, 632 632 &priv->internal_termios)) 633 633 return -EFAULT; 634 634 return 0; ··· 638 638 dbg("%s - port %d Error: port->tty->termios is NULL", __FUNCTION__, port->number); 639 639 return -ENOTTY; 640 640 } 641 - if (!access_ok(VERIFY_READ, user_arg, sizeof(struct termios))) { 641 + if (!access_ok(VERIFY_READ, user_arg, sizeof(struct ktermios))) { 642 642 dbg("%s - port %d Error in access_ok", __FUNCTION__, port->number); 643 643 return -EFAULT; 644 644 } 645 645 if (user_termios_to_kernel_termios(&priv->internal_termios, 646 - (struct termios __user *)arg)) 646 + (struct ktermios __user *)arg)) 647 647 return -EFAULT; 648 648 649 649 settings = kzalloc(50, GFP_KERNEL);
+2 -2
drivers/usb/serial/mct_u232.c
··· 98 98 struct file *filp); 99 99 static void mct_u232_read_int_callback (struct urb *urb); 100 100 static void mct_u232_set_termios (struct usb_serial_port *port, 101 - struct termios * old); 101 + struct ktermios * old); 102 102 static int mct_u232_ioctl (struct usb_serial_port *port, 103 103 struct file * file, 104 104 unsigned int cmd, ··· 556 556 } /* mct_u232_read_int_callback */ 557 557 558 558 static void mct_u232_set_termios (struct usb_serial_port *port, 559 - struct termios *old_termios) 559 + struct ktermios *old_termios) 560 560 { 561 561 struct usb_serial *serial = port->serial; 562 562 struct mct_u232_private *priv = usb_get_serial_port_data(port);
+2 -2
drivers/usb/serial/mos7720.c
··· 1014 1014 * the specified new settings. 1015 1015 */ 1016 1016 static void change_port_settings(struct moschip_port *mos7720_port, 1017 - struct termios *old_termios) 1017 + struct ktermios *old_termios) 1018 1018 { 1019 1019 struct usb_serial_port *port; 1020 1020 struct usb_serial *serial; ··· 1203 1203 * termios structure. 1204 1204 */ 1205 1205 static void mos7720_set_termios(struct usb_serial_port *port, 1206 - struct termios *old_termios) 1206 + struct ktermios *old_termios) 1207 1207 { 1208 1208 int status; 1209 1209 unsigned int cflag;
+2 -2
drivers/usb/serial/mos7840.c
··· 1931 1931 *****************************************************************************/ 1932 1932 1933 1933 static void mos7840_change_port_settings(struct moschip_port *mos7840_port, 1934 - struct termios *old_termios) 1934 + struct ktermios *old_termios) 1935 1935 { 1936 1936 struct tty_struct *tty; 1937 1937 int baud; ··· 2118 2118 *****************************************************************************/ 2119 2119 2120 2120 static void mos7840_set_termios(struct usb_serial_port *port, 2121 - struct termios *old_termios) 2121 + struct ktermios *old_termios) 2122 2122 { 2123 2123 int status; 2124 2124 unsigned int cflag;
+2 -2
drivers/usb/serial/option.c
··· 59 59 static int option_ioctl(struct usb_serial_port *port, struct file *file, 60 60 unsigned int cmd, unsigned long arg); 61 61 static void option_set_termios(struct usb_serial_port *port, 62 - struct termios *old); 62 + struct ktermios *old); 63 63 static void option_break_ctl(struct usb_serial_port *port, int break_state); 64 64 static int option_tiocmget(struct usb_serial_port *port, struct file *file); 65 65 static int option_tiocmset(struct usb_serial_port *port, struct file *file, ··· 230 230 } 231 231 232 232 static void option_set_termios(struct usb_serial_port *port, 233 - struct termios *old_termios) 233 + struct ktermios *old_termios) 234 234 { 235 235 dbg("%s", __FUNCTION__); 236 236
+2 -2
drivers/usb/serial/pl2303.c
··· 455 455 } 456 456 457 457 static void pl2303_set_termios(struct usb_serial_port *port, 458 - struct termios *old_termios) 458 + struct ktermios *old_termios) 459 459 { 460 460 struct usb_serial *serial = port->serial; 461 461 struct pl2303_private *priv = usb_get_serial_port_data(port); ··· 687 687 688 688 static int pl2303_open(struct usb_serial_port *port, struct file *filp) 689 689 { 690 - struct termios tmp_termios; 690 + struct ktermios tmp_termios; 691 691 struct usb_serial *serial = port->serial; 692 692 struct pl2303_private *priv = usb_get_serial_port_data(port); 693 693 unsigned char *buf;
+1 -1
drivers/usb/serial/sierra.c
··· 145 145 } 146 146 147 147 static void sierra_set_termios(struct usb_serial_port *port, 148 - struct termios *old_termios) 148 + struct ktermios *old_termios) 149 149 { 150 150 dbg("%s", __FUNCTION__); 151 151
+2 -2
drivers/usb/serial/ti_usb_3410_5052.c
··· 161 161 static void ti_unthrottle(struct usb_serial_port *port); 162 162 static int ti_ioctl(struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg); 163 163 static void ti_set_termios(struct usb_serial_port *port, 164 - struct termios *old_termios); 164 + struct ktermios *old_termios); 165 165 static int ti_tiocmget(struct usb_serial_port *port, struct file *file); 166 166 static int ti_tiocmset(struct usb_serial_port *port, struct file *file, 167 167 unsigned int set, unsigned int clear); ··· 881 881 882 882 883 883 static void ti_set_termios(struct usb_serial_port *port, 884 - struct termios *old_termios) 884 + struct ktermios *old_termios) 885 885 { 886 886 struct ti_port *tport = usb_get_serial_port_data(port); 887 887 struct tty_struct *tty = port->tty;
+1 -1
drivers/usb/serial/usb-serial.c
··· 397 397 return retval; 398 398 } 399 399 400 - static void serial_set_termios (struct tty_struct *tty, struct termios * old) 400 + static void serial_set_termios (struct tty_struct *tty, struct ktermios * old) 401 401 { 402 402 struct usb_serial_port *port = tty->driver_data; 403 403
+2 -2
drivers/usb/serial/visor.c
··· 46 46 static int visor_calc_num_ports(struct usb_serial *serial); 47 47 static void visor_shutdown (struct usb_serial *serial); 48 48 static int visor_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg); 49 - static void visor_set_termios (struct usb_serial_port *port, struct termios *old_termios); 49 + static void visor_set_termios (struct usb_serial_port *port, struct ktermios *old_termios); 50 50 static void visor_write_bulk_callback (struct urb *urb); 51 51 static void visor_read_bulk_callback (struct urb *urb); 52 52 static void visor_read_int_callback (struct urb *urb); ··· 916 916 917 917 918 918 /* This function is all nice and good, but we don't change anything based on it :) */ 919 - static void visor_set_termios (struct usb_serial_port *port, struct termios *old_termios) 919 + static void visor_set_termios (struct usb_serial_port *port, struct ktermios *old_termios) 920 920 { 921 921 unsigned int cflag; 922 922
+3 -3
drivers/usb/serial/whiteheat.c
··· 145 145 static int whiteheat_write (struct usb_serial_port *port, const unsigned char *buf, int count); 146 146 static int whiteheat_write_room (struct usb_serial_port *port); 147 147 static int whiteheat_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg); 148 - static void whiteheat_set_termios (struct usb_serial_port *port, struct termios * old); 148 + static void whiteheat_set_termios (struct usb_serial_port *port, struct ktermios * old); 149 149 static int whiteheat_tiocmget (struct usb_serial_port *port, struct file *file); 150 150 static int whiteheat_tiocmset (struct usb_serial_port *port, struct file *file, unsigned int set, unsigned int clear); 151 151 static void whiteheat_break_ctl (struct usb_serial_port *port, int break_state); ··· 597 597 static int whiteheat_open (struct usb_serial_port *port, struct file *filp) 598 598 { 599 599 int retval = 0; 600 - struct termios old_term; 600 + struct ktermios old_term; 601 601 602 602 dbg("%s - port %d", __FUNCTION__, port->number); 603 603 ··· 870 870 } 871 871 872 872 873 - static void whiteheat_set_termios (struct usb_serial_port *port, struct termios *old_termios) 873 + static void whiteheat_set_termios (struct usb_serial_port *port, struct ktermios *old_termios) 874 874 { 875 875 dbg("%s -port %d", __FUNCTION__, port->number); 876 876
+2 -2
include/asm-generic/termios.h
··· 11 11 /* 12 12 * Translate a "termio" structure into a "termios". Ugh. 13 13 */ 14 - static inline int user_termio_to_kernel_termios(struct termios *termios, 14 + static inline int user_termio_to_kernel_termios(struct ktermios *termios, 15 15 struct termio __user *termio) 16 16 { 17 17 unsigned short tmp; ··· 48 48 * Translate a "termios" structure into a "termio". Ugh. 49 49 */ 50 50 static inline int kernel_termios_to_user_termio(struct termio __user *termio, 51 - struct termios *termios) 51 + struct ktermios *termios) 52 52 { 53 53 if (put_user(termios->c_iflag, &termio->c_iflag) < 0 || 54 54 put_user(termios->c_oflag, &termio->c_oflag) < 0 ||
+1 -1
include/asm-powerpc/termbits.h
··· 37 37 tcflag_t c_oflag; /* output mode flags */ 38 38 tcflag_t c_cflag; /* control mode flags */ 39 39 tcflag_t c_lflag; /* local mode flags */ 40 - cc_t c_line; /* line discipline */ 41 40 cc_t c_cc[NCCS]; /* control characters */ 41 + cc_t c_line; /* line discipline (== c_cc[19]) */ 42 42 speed_t c_ispeed; /* input speed */ 43 43 speed_t c_ospeed; /* output speed */ 44 44 };
+1 -1
include/linux/generic_serial.h
··· 91 91 int gs_block_til_ready(void *port, struct file *filp); 92 92 void gs_close(struct tty_struct *tty, struct file *filp); 93 93 void gs_set_termios (struct tty_struct * tty, 94 - struct termios * old_termios); 94 + struct ktermios * old_termios); 95 95 int gs_init_port(struct gs_port *port); 96 96 int gs_setserial(struct gs_port *port, struct serial_struct __user *sp); 97 97 int gs_getserial(struct gs_port *port, struct serial_struct __user *sp);
+4 -4
include/linux/isdn.h
··· 511 511 #endif 512 512 struct tty_struct *tty; /* Pointer to corresponding tty */ 513 513 atemu emu; /* AT-emulator data */ 514 - struct termios normal_termios; /* For saving termios structs */ 515 - struct termios callout_termios; 514 + struct ktermios normal_termios; /* For saving termios structs */ 515 + struct ktermios callout_termios; 516 516 wait_queue_head_t open_wait, close_wait; 517 517 struct semaphore write_sem; 518 518 spinlock_t readlock; ··· 525 525 int refcount; /* Number of opens */ 526 526 struct tty_driver *tty_modem; /* tty-device */ 527 527 struct tty_struct *modem_table[ISDN_MAX_CHANNELS]; /* ?? copied from Orig */ 528 - struct termios *modem_termios[ISDN_MAX_CHANNELS]; 529 - struct termios *modem_termios_locked[ISDN_MAX_CHANNELS]; 528 + struct ktermios *modem_termios[ISDN_MAX_CHANNELS]; 529 + struct ktermios *modem_termios_locked[ISDN_MAX_CHANNELS]; 530 530 modem_info info[ISDN_MAX_CHANNELS]; /* Private data */ 531 531 } isdn_modem_t; 532 532
+4 -4
include/linux/serial_core.h
··· 166 166 void (*break_ctl)(struct uart_port *, int ctl); 167 167 int (*startup)(struct uart_port *); 168 168 void (*shutdown)(struct uart_port *); 169 - void (*set_termios)(struct uart_port *, struct termios *new, 170 - struct termios *old); 169 + void (*set_termios)(struct uart_port *, struct ktermios *new, 170 + struct ktermios *old); 171 171 void (*pm)(struct uart_port *, unsigned int state, 172 172 unsigned int oldstate); 173 173 int (*set_wake)(struct uart_port *, unsigned int state); ··· 361 361 */ 362 362 void uart_update_timeout(struct uart_port *port, unsigned int cflag, 363 363 unsigned int baud); 364 - unsigned int uart_get_baud_rate(struct uart_port *port, struct termios *termios, 365 - struct termios *old, unsigned int min, 364 + unsigned int uart_get_baud_rate(struct uart_port *port, struct ktermios *termios, 365 + struct ktermios *old, unsigned int min, 366 366 unsigned int max); 367 367 unsigned int uart_get_divisor(struct uart_port *port, unsigned int baud); 368 368
+1 -1
include/linux/usb/serial.h
··· 218 218 int (*write) (struct usb_serial_port *port, const unsigned char *buf, int count); 219 219 int (*write_room) (struct usb_serial_port *port); 220 220 int (*ioctl) (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg); 221 - void (*set_termios) (struct usb_serial_port *port, struct termios * old); 221 + void (*set_termios) (struct usb_serial_port *port, struct ktermios * old); 222 222 void (*break_ctl) (struct usb_serial_port *port, int break_state); 223 223 int (*chars_in_buffer) (struct usb_serial_port *port); 224 224 void (*throttle) (struct usb_serial_port *port);
+2 -2
net/bluetooth/rfcomm/tty.c
··· 752 752 return -ENOIOCTLCMD; 753 753 } 754 754 755 - static void rfcomm_tty_set_termios(struct tty_struct *tty, struct termios *old) 755 + static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old) 756 756 { 757 - struct termios *new = (struct termios *) tty->termios; 757 + struct ktermios *new = tty->termios; 758 758 int old_baud_rate = tty_termios_baud_rate(old); 759 759 int new_baud_rate = tty_termios_baud_rate(new); 760 760