On Wed, Nov 05, 2014 at 06:26:29PM +0100, Peter Hurley wrote: > ASYNC_SPLIT_TERMIOS behavior is a remnant of the long-dead /dev/cuaXX > callout device. Split termios handling was removed tree-wide in v2.5.71 by: > > commit 99a21edebbfd8c29e39ee7fcc8a1ffa423657290 > Author: Alexander Viro <[email protected]> > Date: Wed Jun 11 07:41:28 2003 -0700 > > [PATCH] tty_driver refcounting > > killed the last remnants of callout stuff - we don't need to mess with > storing termios privately anymore. > > which pre-dated the re-introduction into the cris serial driver > in v2.6.7 by: > > commit 311a5ffeda8ccb3f1f3840069f37234e043092d4 > Author: Andrew Morton <[email protected]> > Date: Mon May 31 18:52:29 2004 -0700 > > [PATCH] CRIS architecture update > > From: "Mikael Starvik" <[email protected]> > > - Lots of fixes from 2.4. > > - Updated for 2.6.6. > > - Added IDE driver > > Cc: Mikael Starvik <[email protected]>
Agreed. Acked-by: Jesper Nilsson <[email protected]> > Signed-off-by: Peter Hurley <[email protected]> > --- > drivers/tty/serial/crisv10.c | 12 ------------ > drivers/tty/serial/crisv10.h | 1 - > 2 files changed, 13 deletions(-) > > diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c > index 58e6f61..0c1825b 100644 > --- a/drivers/tty/serial/crisv10.c > +++ b/drivers/tty/serial/crisv10.c > @@ -3676,12 +3676,6 @@ rs_close(struct tty_struct *tty, struct file * filp) > } > info->port.flags |= ASYNC_CLOSING; > /* > - * Save the termios structure, since this port may have > - * separate termios for callout and dialin. > - */ > - if (info->port.flags & ASYNC_NORMAL_ACTIVE) > - info->normal_termios = tty->termios; > - /* > * Now we wait for the transmit buffer to clear; and we notify > * the line discipline to only process XON/XOFF characters. > */ > @@ -4076,11 +4070,6 @@ rs_open(struct tty_struct *tty, struct file * filp) > return retval; > } > > - if ((info->port.count == 1) && (info->port.flags & > ASYNC_SPLIT_TERMIOS)) { > - tty->termios = info->normal_termios; > - change_speed(info); > - } > - > #ifdef SERIAL_DEBUG_OPEN > printk("rs_open ttyS%d successful...\n", info->line); > #endif > @@ -4327,7 +4316,6 @@ static int __init rs_init(void) > info->custom_divisor = 0; > info->x_char = 0; > info->event = 0; > - info->normal_termios = driver->init_termios; > info->xmit.buf = NULL; > info->xmit.tail = info->xmit.head = 0; > info->first_recv_buffer = info->last_recv_buffer = NULL; > diff --git a/drivers/tty/serial/crisv10.h b/drivers/tty/serial/crisv10.h > index 7599014..15a52ee 100644 > --- a/drivers/tty/serial/crisv10.h > +++ b/drivers/tty/serial/crisv10.h > @@ -98,7 +98,6 @@ struct e100_serial { > > struct work_struct work; > struct async_icount icount; /* error-statistics etc.*/ > - struct ktermios normal_termios; > > unsigned long char_time_usec; /* The time for 1 char, in usecs */ > unsigned long flush_time_usec; /* How often we should flush */ > -- > 2.1.3 /^JN - Jesper Nilsson -- Jesper Nilsson -- [email protected] -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
