TTY: add tty_port_tty_hangup helper

It allows for cleaning up on a considerable amount of places. They did
port_get, hangup, kref_put. Now the only thing needed is to call
tty_port_tty_hangup which does exactly that. And they can also decide
whether to consider CLOCAL or completely ignore that.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 10 insertions, 33 deletions

diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 1fd1935c8316..b011478d2e5f 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -378,7 +378,6 @@ static void	usa26_instat_callback(struct urb *urb)
         struct usb_serial                       *serial;
         struct usb_serial_port                  *port;
         struct keyspan_port_private             *p_priv;
-        struct tty_struct                       *tty;
         int old_dcd_state, err;
         int status = urb->status;
 
@@ -421,12 +420,8 @@ static void	usa26_instat_callback(struct urb *urb)
         p_priv->dcd_state = ((msg->gpia_dcd) ? 1 : 0);
         p_priv->ri_state = ((msg->ri) ? 1 : 0);
 
-        if (old_dcd_state != p_priv->dcd_state) {
-                tty = tty_port_tty_get(&port->port);
-                if (tty && !C_CLOCAL(tty))
-                        tty_hangup(tty);
-                tty_kref_put(tty);
-        }
+        if (old_dcd_state != p_priv->dcd_state)
+                tty_port_tty_hangup(&port->port, true);
 
         /* Resubmit urb so we continue receiving */
         err = usb_submit_urb(urb, GFP_ATOMIC);
@@ -510,7 +505,6 @@ static void	usa28_instat_callback(struct urb *urb)
         struct usb_serial                       *serial;
         struct usb_serial_port                  *port;
         struct keyspan_port_private             *p_priv;
-        struct tty_struct                       *tty;
         int old_dcd_state;
         int status = urb->status;
 
@@ -551,12 +545,8 @@ static void	usa28_instat_callback(struct urb *urb)
         p_priv->dcd_state = ((msg->dcd) ? 1 : 0);
         p_priv->ri_state = ((msg->ri) ? 1 : 0);
 
-        if (old_dcd_state != p_priv->dcd_state && old_dcd_state) {
-                tty = tty_port_tty_get(&port->port);
-                if (tty && !C_CLOCAL(tty))
-                        tty_hangup(tty);
-                tty_kref_put(tty);
-        }
+        if (old_dcd_state != p_priv->dcd_state && old_dcd_state)
+                tty_port_tty_hangup(&port->port, true);
 
                 /* Resubmit urb so we continue receiving */
         err = usb_submit_urb(urb, GFP_ATOMIC);
@@ -642,12 +632,8 @@ static void	usa49_instat_callback(struct urb *urb)
         p_priv->dcd_state = ((msg->dcd) ? 1 : 0);
         p_priv->ri_state = ((msg->ri) ? 1 : 0);
 
-        if (old_dcd_state != p_priv->dcd_state && old_dcd_state) {
-                struct tty_struct *tty = tty_port_tty_get(&port->port);
-                if (tty && !C_CLOCAL(tty))
-                        tty_hangup(tty);
-                tty_kref_put(tty);
-        }
+        if (old_dcd_state != p_priv->dcd_state && old_dcd_state)
+                tty_port_tty_hangup(&port->port, true);
 
         /* Resubmit urb so we continue receiving */
         err = usb_submit_urb(urb, GFP_ATOMIC);
@@ -851,7 +837,6 @@ static void	usa90_instat_callback(struct urb *urb)
         struct usb_serial                       *serial;
         struct usb_serial_port                  *port;
         struct keyspan_port_private             *p_priv;
-        struct tty_struct                       *tty;
         int old_dcd_state, err;
         int status = urb->status;
 
@@ -880,12 +865,8 @@ static void	usa90_instat_callback(struct urb *urb)
         p_priv->dcd_state = ((msg->dcd) ? 1 : 0);
         p_priv->ri_state = ((msg->ri) ? 1 : 0);
 
-        if (old_dcd_state != p_priv->dcd_state && old_dcd_state) {
-                tty = tty_port_tty_get(&port->port);
-                if (tty && !C_CLOCAL(tty))
-                        tty_hangup(tty);
-                tty_kref_put(tty);
-        }
+        if (old_dcd_state != p_priv->dcd_state && old_dcd_state)
+                tty_port_tty_hangup(&port->port, true);
 
         /* Resubmit urb so we continue receiving */
         err = usb_submit_urb(urb, GFP_ATOMIC);
@@ -953,12 +934,8 @@ static void	usa67_instat_callback(struct urb *urb)
         p_priv->cts_state = ((msg->hskia_cts) ? 1 : 0);
         p_priv->dcd_state = ((msg->gpia_dcd) ? 1 : 0);
 
-        if (old_dcd_state != p_priv->dcd_state && old_dcd_state) {
-                struct tty_struct *tty = tty_port_tty_get(&port->port);
-                if (tty && !C_CLOCAL(tty))
-                        tty_hangup(tty);
-                tty_kref_put(tty);
-        }
+        if (old_dcd_state != p_priv->dcd_state && old_dcd_state)
+                tty_port_tty_hangup(&port->port, true);
 
         /* Resubmit urb so we continue receiving */
         err = usb_submit_urb(urb, GFP_ATOMIC);