diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2012-04-02 13:54:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-09 21:02:44 +0200 |
| commit | 4a85b1fc59734ba2f2e91623d042eadc4efb7886 (patch) | |
| tree | f82ae2547dea84d0b14106d8d5c2af367ccc3043 /drivers/tty/serial | |
| parent | TTY: 68328serial, use open/close_wait from tty_port (diff) | |
| download | linux-4a85b1fc59734ba2f2e91623d042eadc4efb7886.tar.xz linux-4a85b1fc59734ba2f2e91623d042eadc4efb7886.zip | |
TTY: 68328serial, use close_delay/closing_wait from tty_port
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@lists.linux-m68k.org
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
| -rw-r--r-- | drivers/tty/serial/68328serial.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c index 0c50f2e1ae01..e9fd13ec52a8 100644 --- a/drivers/tty/serial/68328serial.c +++ b/drivers/tty/serial/68328serial.c @@ -120,8 +120,6 @@ struct m68k_serial { struct tty_struct *tty; int custom_divisor; int x_char; /* xon/xoff character */ - int close_delay; - unsigned short closing_wait; int line; unsigned char *xmit_buf; int xmit_head; @@ -828,8 +826,8 @@ static int get_serial_info(struct m68k_serial * info, tmp.irq = info->irq; tmp.flags = info->flags; tmp.baud_base = info->baud_base; - tmp.close_delay = info->close_delay; - tmp.closing_wait = info->closing_wait; + tmp.close_delay = info->tport.close_delay; + tmp.closing_wait = info->tport.closing_wait; tmp.custom_divisor = info->custom_divisor; if (copy_to_user(retinfo, &tmp, sizeof(*retinfo))) return -EFAULT; @@ -840,6 +838,7 @@ static int get_serial_info(struct m68k_serial * info, static int set_serial_info(struct m68k_serial * info, struct serial_struct * new_info) { + struct tty_port *port = &info->tport; struct serial_struct new_serial; struct m68k_serial old_info; int retval = 0; @@ -853,7 +852,7 @@ static int set_serial_info(struct m68k_serial * info, if (!capable(CAP_SYS_ADMIN)) { if ((new_serial.baud_base != info->baud_base) || (new_serial.type != info->type) || - (new_serial.close_delay != info->close_delay) || + (new_serial.close_delay != port->close_delay) || ((new_serial.flags & ~ASYNC_USR_MASK) != (info->flags & ~ASYNC_USR_MASK))) return -EPERM; @@ -863,7 +862,7 @@ static int set_serial_info(struct m68k_serial * info, goto check_and_exit; } - if (info->tport.count > 1) + if (port->count > 1) return -EBUSY; /* @@ -875,8 +874,8 @@ static int set_serial_info(struct m68k_serial * info, info->flags = ((info->flags & ~ASYNC_FLAGS) | (new_serial.flags & ASYNC_FLAGS)); info->type = new_serial.type; - info->close_delay = new_serial.close_delay; - info->closing_wait = new_serial.closing_wait; + port->close_delay = new_serial.close_delay; + port->closing_wait = new_serial.closing_wait; check_and_exit: retval = startup(info); @@ -1048,8 +1047,8 @@ static void rs_close(struct tty_struct *tty, struct file * filp) * the line discipline to only process XON/XOFF characters. */ tty->closing = 1; - if (info->closing_wait != ASYNC_CLOSING_WAIT_NONE) - tty_wait_until_sent(tty, info->closing_wait); + if (port->closing_wait != ASYNC_CLOSING_WAIT_NONE) + tty_wait_until_sent(tty, port->closing_wait); /* * At this point we stop accepting input. To do this, we * disable the receive line status interrupts, and tell the @@ -1078,9 +1077,8 @@ static void rs_close(struct tty_struct *tty, struct file * filp) } #endif if (port->blocked_open) { - if (info->close_delay) { - msleep_interruptible(jiffies_to_msecs(info->close_delay)); - } + if (port->close_delay) + msleep_interruptible(jiffies_to_msecs(port->close_delay)); wake_up_interruptible(&port->open_wait); } info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING); @@ -1296,8 +1294,6 @@ rs68328_init(void) info->tty = NULL; info->irq = uart_irqs[i]; info->custom_divisor = 16; - info->close_delay = 50; - info->closing_wait = 3000; info->x_char = 0; info->line = i; info->is_cons = 1; /* Means shortcuts work */ |