Merge tag 'tty-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial driver update from Greg Kroah-Hartman:
 "Here's the big tty/serial driver merge request for 3.10-rc1

  Once again, Jiri has a number of TTY driver fixes and cleanups, and
  Peter Hurley came through with a bunch of ldisc fixes that resolve a
  number of reported issues.  There are some other serial driver
  cleanups as well.

  All of these have been in the linux-next tree for a while"

* tag 'tty-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (117 commits)
  tty/serial/sirf: fix MODULE_DEVICE_TABLE
  serial: mxs: drop superfluous {get|put}_device
  serial: mxs: fix buffer overflow
  ARM: PL011: add support for extended FIFO-size of PL011-r1p5
  serial_core.c: add put_device() after device_find_child()
  tty: Fix unsafe bit ops in tty_throttle_safe/unthrottle_safe
  serial: sccnxp: Replace pdata.init/exit with regulator API
  serial: sccnxp: Do not override device name
  TTY: pty, fix compilation warning
  TTY: rocket, fix compilation warning
  TTY: ircomm: fix DTR being raised on hang up
  TTY: synclinkmp: fix DTR being raised on hang up
  TTY: synclink_gt: fix DTR being raised on hang up
  TTY: synclink: fix DTR being raised on hang up
  serial: 8250_dw: Fix the stub for dw8250_probe_acpi()
  serial: 8250_dw: Convert to devm_ioremap()
  serial: 8250_dw: Set port capabilities based on CPR register
  serial: 8250_dw: Let ACPI code extract the DMA client info
  serial: 8250_dw: Support clk framework also with ACPI
  serial: 8250_dw: Enable runtime PM
  ...

1 files changed, 7 insertions, 24 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 387dc6c8ad25..c77f7ae48f1c 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -292,7 +292,6 @@ static void acm_ctrl_irq(struct urb *urb)
 {
         struct acm *acm = urb->context;
         struct usb_cdc_notification *dr = urb->transfer_buffer;
-        struct tty_struct *tty;
         unsigned char *data;
         int newctrl;
         int retval;
@@ -327,17 +326,12 @@ static void acm_ctrl_irq(struct urb *urb)
                 break;
 
         case USB_CDC_NOTIFY_SERIAL_STATE:
-                tty = tty_port_tty_get(&acm->port);
                 newctrl = get_unaligned_le16(data);
 
-                if (tty) {
-                        if (!acm->clocal &&
-                                (acm->ctrlin & ~newctrl & ACM_CTRL_DCD)) {
-                                dev_dbg(&acm->control->dev,
-                                        "%s - calling hangup\n", __func__);
-                                tty_hangup(tty);
-                        }
-                        tty_kref_put(tty);
+                if (!acm->clocal && (acm->ctrlin & ~newctrl & ACM_CTRL_DCD)) {
+                        dev_dbg(&acm->control->dev, "%s - calling hangup\n",
+                                        __func__);
+                        tty_port_tty_hangup(&acm->port, false);
                 }
 
                 acm->ctrlin = newctrl;
@@ -475,15 +469,10 @@ static void acm_write_bulk(struct urb *urb)
 static void acm_softint(struct work_struct *work)
 {
         struct acm *acm = container_of(work, struct acm, work);
-        struct tty_struct *tty;
 
         dev_vdbg(&acm->data->dev, "%s\n", __func__);
 
-        tty = tty_port_tty_get(&acm->port);
-        if (!tty)
-                return;
-        tty_wakeup(tty);
-        tty_kref_put(tty);
+        tty_port_tty_wakeup(&acm->port);
 }
 
 /*
@@ -1519,15 +1508,9 @@ err_out:
 static int acm_reset_resume(struct usb_interface *intf)
 {
         struct acm *acm = usb_get_intfdata(intf);
-        struct tty_struct *tty;
 
-        if (test_bit(ASYNCB_INITIALIZED, &acm->port.flags)) {
-                tty = tty_port_tty_get(&acm->port);
-                if (tty) {
-                        tty_hangup(tty);
-                        tty_kref_put(tty);
-                }
-        }
+        if (test_bit(ASYNCB_INITIALIZED, &acm->port.flags))
+                tty_port_tty_hangup(&acm->port, false);
 
         return acm_resume(intf);
 }