7 files changed, 32 insertions, 57 deletions

diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
index 345bd0e0884e..33f83fee9fae 100644
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -1124,14 +1124,8 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                                         readl(&info->u.cyz.ch_ctrl->rs_status);
                                 if (dcd & C_RS_DCD)
                                         wake_up_interruptible(&info->port.open_wait);
-                                else {
-                                        struct tty_struct *tty;
-                                        tty = tty_port_tty_get(&info->port);
-                                        if (tty) {
-                                                tty_hangup(tty);
-                                                tty_kref_put(tty);
-                                        }
-                                }
+                                else
+                                        tty_port_tty_hangup(&info->port, false);
                         }
                         break;
                 case C_CM_MCTS:
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index adeac255e526..1deaca4674e4 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -913,16 +913,12 @@ static void moxa_board_deinit(struct moxa_board_conf *brd)
 
         /* pci hot-un-plug support */
         for (a = 0; a < brd->numPorts; a++)
-                if (brd->ports[a].port.flags & ASYNC_INITIALIZED) {
-                        struct tty_struct *tty = tty_port_tty_get(
-                                                &brd->ports[a].port);
-                        if (tty) {
-                                tty_hangup(tty);
-                                tty_kref_put(tty);
-                        }
-                }
+                if (brd->ports[a].port.flags & ASYNC_INITIALIZED)
+                        tty_port_tty_hangup(&brd->ports[a].port, false);
+
         for (a = 0; a < MAX_PORTS_PER_BOARD; a++)
                 tty_port_destroy(&brd->ports[a].port);
+
         while (1) {
                 opened = 0;
                 for (a = 0; a < brd->numPorts; a++)
@@ -1365,7 +1361,6 @@ static void moxa_hangup(struct tty_struct *tty)
 
 static void moxa_new_dcdstate(struct moxa_port *p, u8 dcd)
 {
-        struct tty_struct *tty;
         unsigned long flags;
         dcd = !!dcd;
 
@@ -1373,10 +1368,8 @@ static void moxa_new_dcdstate(struct moxa_port *p, u8 dcd)
         if (dcd != p->DCDState) {
                 p->DCDState = dcd;
                 spin_unlock_irqrestore(&p->port.lock, flags);
-                tty = tty_port_tty_get(&p->port);
-                if (tty && !C_CLOCAL(tty) && !dcd)
-                        tty_hangup(tty);
-                tty_kref_put(tty);
+                if (!dcd)
+                        tty_port_tty_hangup(&p->port, true);
         }
         else
                 spin_unlock_irqrestore(&p->port.lock, flags);
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 4a43ef5d7962..74d9a0258d7c 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -1418,11 +1418,7 @@ static void gsm_dlci_close(struct gsm_dlci *dlci)
                 pr_debug("DLCI %d goes closed.\n", dlci->addr);
         dlci->state = DLCI_CLOSED;
         if (dlci->addr != 0) {
-                struct tty_struct  *tty = tty_port_tty_get(&dlci->port);
-                if (tty) {
-                        tty_hangup(tty);
-                        tty_kref_put(tty);
-                }
+                tty_port_tty_hangup(&dlci->port, false);
                 kfifo_reset(dlci->fifo);
         } else
                 dlci->gsm->dead = 1;
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index 2e5bbdc09e1c..d6080c3831ef 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -1501,12 +1501,9 @@ static void tty_exit(struct nozomi *dc)
 
         DBG1(" ");
 
-        for (i = 0; i < MAX_PORT; ++i) {
-                struct tty_struct *tty = tty_port_tty_get(&dc->port[i].port);
-                if (tty && list_empty(&tty->hangup_work.entry))
-                        tty_hangup(tty);
-                tty_kref_put(tty);
-        }
+        for (i = 0; i < MAX_PORT; ++i)
+                tty_port_tty_hangup(&dc->port[i].port, false);
+
         /* Racy below - surely should wait for scheduled work to be done or
            complete off a hangup method ? */
         while (dc->open_ttys)
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index 1d270034bfc3..bbffd7a431e9 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -521,15 +521,10 @@ static void rp_handle_port(struct r_port *info)
                        (ChanStatus & CD_ACT) ? "on" : "off");
 #endif
                 if (!(ChanStatus & CD_ACT) && info->cd_status) {
-                        struct tty_struct *tty;
 #ifdef ROCKET_DEBUG_HANGUP
                         printk(KERN_INFO "CD drop, calling hangup.\n");
 #endif
-                        tty = tty_port_tty_get(&info->port);
-                        if (tty) {
-                                tty_hangup(tty);
-                                tty_kref_put(tty);
-                        }
+                        tty_port_tty_hangup(&info->port, false);
                 }
                 info->cd_status = (ChanStatus & CD_ACT) ? 1 : 0;
                 wake_up_interruptible(&info->port.open_wait);
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index d723d4193b90..2c77fed31a72 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -270,23 +270,6 @@ static void mrdy_assert(struct ifx_spi_device *ifx_dev)
 }
 
 /**
- *      ifx_spi_hangup          -       hang up an IFX device
- *      @ifx_dev: our SPI device
- *
- *      Hang up the tty attached to the IFX device if one is currently
- *      open. If not take no action
- */
-static void ifx_spi_ttyhangup(struct ifx_spi_device *ifx_dev)
-{
-        struct tty_port *pport = &ifx_dev->tty_port;
-        struct tty_struct *tty = tty_port_tty_get(pport);
-        if (tty) {
-                tty_hangup(tty);
-                tty_kref_put(tty);
-        }
-}
-
-/**
  *      ifx_spi_timeout         -       SPI timeout
  *      @arg: our SPI device
  *
@@ -298,7 +281,7 @@ static void ifx_spi_timeout(unsigned long arg)
         struct ifx_spi_device *ifx_dev = (struct ifx_spi_device *)arg;
 
         dev_warn(&ifx_dev->spi_dev->dev, "*** SPI Timeout ***");
-        ifx_spi_ttyhangup(ifx_dev);
+        tty_port_tty_hangup(&ifx_dev->tty_port, false);
         mrdy_set_low(ifx_dev);
         clear_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags);
 }
@@ -933,7 +916,7 @@ static irqreturn_t ifx_spi_reset_interrupt(int irq, void *dev)
                 set_bit(MR_INPROGRESS, &ifx_dev->mdm_reset_state);
                 if (!solreset) {
                         /* unsolicited reset  */
-                        ifx_spi_ttyhangup(ifx_dev);
+                        tty_port_tty_hangup(&ifx_dev->tty_port, false);
                 }
         } else {
                 /* exited reset */
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
index 8bb757c62ee2..7f38eeaafac3 100644
--- a/drivers/tty/tty_port.c
+++ b/drivers/tty/tty_port.c
@@ -233,6 +233,23 @@ void tty_port_hangup(struct tty_port *port)
 EXPORT_SYMBOL(tty_port_hangup);
 
 /**
+ * tty_port_tty_hangup - helper to hang up a tty
+ *
+ * @port: tty port
+ * @check_clocal: hang only ttys with CLOCAL unset?
+ */
+void tty_port_tty_hangup(struct tty_port *port, bool check_clocal)
+{
+        struct tty_struct *tty = tty_port_tty_get(port);
+
+        if (tty && (!check_clocal || !C_CLOCAL(tty))) {
+                tty_hangup(tty);
+                tty_kref_put(tty);
+        }
+}
+EXPORT_SYMBOL_GPL(tty_port_tty_hangup);
+
+/**
  * tty_port_tty_wakeup - helper to wake up a tty
  *
  * @port: tty port