diff options
author | Jiri Slaby <jslaby@suse.cz> | 2012-03-05 14:52:49 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-08 12:50:02 -0800 |
commit | 9b937421e852cfa9992d6e1a1d814dcec8eb1ce3 (patch) | |
tree | c5dae1ce3a2e61335145ae3b66508b5d0524b749 /drivers/tty | |
parent | b8edebe4b8b4ad5bd436cf9080b77b29e219029a (diff) |
TTY: amiserial, use tty_port_close_start
Again, no need to duplicate the code. Let's use the helper.
Amiserial changes are only free of compilation errors. I have no
access to the hardware.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/amiserial.c | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c index 9c8b199bad3..afadcd43d14 100644 --- a/drivers/tty/amiserial.c +++ b/drivers/tty/amiserial.c @@ -1389,53 +1389,13 @@ static void rs_close(struct tty_struct *tty, struct file * filp) { struct serial_state *state = tty->driver_data; struct tty_port *port = &state->tport; - unsigned long flags; - if (!state || serial_paranoia_check(state, tty->name, "rs_close")) + if (serial_paranoia_check(state, tty->name, "rs_close")) return; - local_irq_save(flags); - - if (tty_hung_up_p(filp)) { - DBG_CNT("before DEC-hung"); - local_irq_restore(flags); + if (tty_port_close_start(port, tty, filp) == 0) return; - } -#ifdef SERIAL_DEBUG_OPEN - printk("rs_close ttys%d, count = %d\n", state->line, port->count); -#endif - if ((tty->count == 1) && (port->count != 1)) { - /* - * Uh, oh. tty->count is 1, which means that the tty - * structure will be freed. port->count should always - * be one in these conditions. If it's greater than - * one, we've got real problems, since it means the - * serial port won't be shutdown. - */ - printk("rs_close: bad serial port count; tty->count is 1, " - "port->count is %d\n", state->tport.count); - port->count = 1; - } - if (--port->count < 0) { - printk("rs_close: bad serial port count for ttys%d: %d\n", - tty->index, port->count); - port->count = 0; - } - if (port->count) { - DBG_CNT("before DEC-2"); - local_irq_restore(flags); - return; - } - port->flags |= ASYNC_CLOSING; - /* - * Now we wait for the transmit buffer to clear; and we notify - * the line discipline to only process XON/XOFF characters. - */ - tty->closing = 1; - local_irq_restore(flags); - 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 |