]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
TTY: ircomm, use tty_port_close_end helper
authorJiri Slaby <jslaby@suse.cz>
Mon, 4 Jun 2012 11:35:24 +0000 (13:35 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 12 Jun 2012 22:50:24 +0000 (15:50 -0700)
Again, the code is identical, so leverage the helper code.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Samuel Ortiz <samuel@sortiz.org>
Cc: netdev@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/irda/ircomm/ircomm_tty.c

index 3fdce18c6931bb165cf81014d09d5c92f1faf387..cfe352dfb4847d7d703fccf5ca4d49f43beb9f32 100644 (file)
@@ -568,21 +568,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
        tty_driver_flush_buffer(tty);
        tty_ldisc_flush(tty);
 
-       spin_lock_irqsave(&port->lock, flags);
-       tty->closing = 0;
-
-       if (port->blocked_open) {
-               if (port->close_delay) {
-                       spin_unlock_irqrestore(&port->lock, flags);
-                       schedule_timeout_interruptible(port->close_delay);
-                       spin_lock_irqsave(&port->lock, flags);
-               }
-               wake_up_interruptible(&port->open_wait);
-       }
-
-       port->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
-       spin_unlock_irqrestore(&port->lock, flags);
-       wake_up_interruptible(&port->close_wait);
+       tty_port_close_end(port, tty);
        tty_port_tty_set(port, NULL);
 }