aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/mxser_new.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c
index 13b9072a7729..4d4721e5c6ae 100644
--- a/drivers/char/mxser_new.c
+++ b/drivers/char/mxser_new.c
@@ -237,8 +237,6 @@ struct mxser_port {
237 long realbaud; 237 long realbaud;
238 int type; /* UART type */ 238 int type; /* UART type */
239 int flags; /* defined in tty.h */ 239 int flags; /* defined in tty.h */
240 long session; /* Session of opening process */
241 long pgrp; /* pgrp of opening process */
242 240
243 int x_char; /* xon/xoff character */ 241 int x_char; /* xon/xoff character */
244 int IER; /* Interrupt Enable Register */ 242 int IER; /* Interrupt Enable Register */
@@ -267,14 +265,12 @@ struct mxser_port {
267 int xmit_cnt; 265 int xmit_cnt;
268 266
269 struct ktermios normal_termios; 267 struct ktermios normal_termios;
270 struct ktermios callout_termios;
271 268
272 struct mxser_mon mon_data; 269 struct mxser_mon mon_data;
273 270
274 spinlock_t slock; 271 spinlock_t slock;
275 struct work_struct tqueue; 272 struct work_struct tqueue;
276 wait_queue_head_t open_wait; 273 wait_queue_head_t open_wait;
277 wait_queue_head_t close_wait;
278 wait_queue_head_t delta_msr_wait; 274 wait_queue_head_t delta_msr_wait;
279}; 275};
280 276
@@ -936,17 +932,6 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)
936 if (retval) 932 if (retval)
937 return retval; 933 return retval;
938 934
939 if ((info->count == 1) && (info->flags & ASYNC_SPLIT_TERMIOS)) {
940 if (tty->driver->subtype == SERIAL_TYPE_NORMAL)
941 *tty->termios = info->normal_termios;
942 else
943 *tty->termios = info->callout_termios;
944 mxser_change_speed(info, NULL);
945 }
946
947 info->session = process_session(current);
948 info->pgrp = process_group(current);
949
950 /* unmark here for very high baud rate (ex. 921600 bps) used */ 935 /* unmark here for very high baud rate (ex. 921600 bps) used */
951 tty->low_latency = 1; 936 tty->low_latency = 1;
952 return 0; 937 return 0;
@@ -1053,8 +1038,6 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
1053 } 1038 }
1054 1039
1055 info->flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING); 1040 info->flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING);
1056 wake_up_interruptible(&info->close_wait);
1057
1058} 1041}
1059 1042
1060static int mxser_write(struct tty_struct *tty, const unsigned char *buf, int count) 1043static int mxser_write(struct tty_struct *tty, const unsigned char *buf, int count)
@@ -2420,7 +2403,6 @@ static int __devinit mxser_initbrd(struct mxser_board *brd,
2420 INIT_WORK(&info->tqueue, mxser_do_softint); 2403 INIT_WORK(&info->tqueue, mxser_do_softint);
2421 info->normal_termios = mxvar_sdriver->init_termios; 2404 info->normal_termios = mxvar_sdriver->init_termios;
2422 init_waitqueue_head(&info->open_wait); 2405 init_waitqueue_head(&info->open_wait);
2423 init_waitqueue_head(&info->close_wait);
2424 init_waitqueue_head(&info->delta_msr_wait); 2406 init_waitqueue_head(&info->delta_msr_wait);
2425 memset(&info->mon_data, 0, sizeof(struct mxser_mon)); 2407 memset(&info->mon_data, 0, sizeof(struct mxser_mon));
2426 info->err_shadow = 0; 2408 info->err_shadow = 0;