1 files changed, 17 insertions, 81 deletions

diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 7777172206de..158bf4bc29cc 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -86,7 +86,7 @@ struct edgeport_port {
         int baud_rate;
         int close_pending;
         int lsr_event;
-        struct async_icount     icount;
+
         struct edgeport_serial  *edge_serial;
         struct usb_serial_port  *port;
         __u8 bUartMode;         /* Port type, 0: RS232, etc. */
@@ -206,7 +206,7 @@ static int restart_read(struct edgeport_port *edge_port);
 
 static void edge_set_termios(struct tty_struct *tty,
                 struct usb_serial_port *port, struct ktermios *old_termios);
-static void edge_send(struct tty_struct *tty);
+static void edge_send(struct usb_serial_port *port, struct tty_struct *tty);
 
 /* sysfs attributes */
 static int edge_create_sysfs_attrs(struct usb_serial_port *port);
@@ -1445,7 +1445,7 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 msr)
 
         if (msr & (EDGEPORT_MSR_DELTA_CTS | EDGEPORT_MSR_DELTA_DSR |
                         EDGEPORT_MSR_DELTA_RI | EDGEPORT_MSR_DELTA_CD)) {
-                icount = &edge_port->icount;
+                icount = &edge_port->port->icount;
 
                 /* update input line counters */
                 if (msr & EDGEPORT_MSR_DELTA_CTS)
@@ -1456,7 +1456,7 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 msr)
                         icount->dcd++;
                 if (msr & EDGEPORT_MSR_DELTA_RI)
                         icount->rng++;
-                wake_up_interruptible(&edge_port->port->delta_msr_wait);
+                wake_up_interruptible(&edge_port->port->port.delta_msr_wait);
         }
 
         /* Save the new modem status */
@@ -1498,7 +1498,7 @@ static void handle_new_lsr(struct edgeport_port *edge_port, int lsr_data,
                 edge_tty_recv(edge_port->port, &data, 1);
 
         /* update input line counters */
-        icount = &edge_port->icount;
+        icount = &edge_port->port->icount;
         if (new_lsr & LSR_BREAK)
                 icount->brk++;
         if (new_lsr & LSR_OVER_ERR)
@@ -1657,7 +1657,7 @@ static void edge_bulk_in_callback(struct urb *urb)
                 else
                         edge_tty_recv(edge_port->port, data,
                                         urb->actual_length);
-                edge_port->icount.rx += urb->actual_length;
+                edge_port->port->icount.rx += urb->actual_length;
         }
 
 exit:
@@ -1712,7 +1712,7 @@ static void edge_bulk_out_callback(struct urb *urb)
 
         /* send any buffered data */
         tty = tty_port_tty_get(&port->port);
-        edge_send(tty);
+        edge_send(port, tty);
         tty_kref_put(tty);
 }
 
@@ -1750,8 +1750,6 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
 
         dev = port->serial->dev;
 
-        memset(&(edge_port->icount), 0x00, sizeof(edge_port->icount));
-
         /* turn off loopback */
         status = ti_do_config(edge_port, UMPC_SET_CLR_LOOPBACK, 0);
         if (status) {
@@ -1909,21 +1907,10 @@ static void edge_close(struct usb_serial_port *port)
         kfifo_reset_out(&edge_port->write_fifo);
         spin_unlock_irqrestore(&edge_port->ep_lock, flags);
 
-        /* assuming we can still talk to the device,
-         * send a close port command to it */
         dev_dbg(&port->dev, "%s - send umpc_close_port\n", __func__);
         port_number = port->number - port->serial->minor;
-
-        mutex_lock(&serial->disc_mutex);
-        if (!serial->disconnected) {
-                send_cmd(serial->dev,
-                                     UMPC_CLOSE_PORT,
-                                     (__u8)(UMPM_UART1_PORT + port_number),
-                                     0,
-                                     NULL,
-                                     0);
-        }
-        mutex_unlock(&serial->disc_mutex);
+        send_cmd(serial->dev, UMPC_CLOSE_PORT,
+                     (__u8)(UMPM_UART1_PORT + port_number), 0, NULL, 0);
 
         mutex_lock(&edge_serial->es_lock);
         --edge_port->edge_serial->num_ports_open;
@@ -1953,14 +1940,13 @@ static int edge_write(struct tty_struct *tty, struct usb_serial_port *port,
 
         count = kfifo_in_locked(&edge_port->write_fifo, data, count,
                                                         &edge_port->ep_lock);
-        edge_send(tty);
+        edge_send(port, tty);
 
         return count;
 }
 
-static void edge_send(struct tty_struct *tty)
+static void edge_send(struct usb_serial_port *port, struct tty_struct *tty)
 {
-        struct usb_serial_port *port = tty->driver_data;
         int count, result;
         struct edgeport_port *edge_port = usb_get_serial_port_data(port);
         unsigned long flags;
@@ -1999,7 +1985,7 @@ static void edge_send(struct tty_struct *tty)
                 edge_port->ep_write_urb_in_use = 0;
                 /* TODO: reschedule edge_send */
         } else
-                edge_port->icount.tx += count;
+                edge_port->port->icount.tx += count;
 
         /* wakeup any process waiting for writes to complete */
         /* there is now more room in the buffer for new writes */
@@ -2360,27 +2346,6 @@ static int edge_tiocmget(struct tty_struct *tty)
         return result;
 }
 
-static int edge_get_icount(struct tty_struct *tty,
-                                struct serial_icounter_struct *icount)
-{
-        struct usb_serial_port *port = tty->driver_data;
-        struct edgeport_port *edge_port = usb_get_serial_port_data(port);
-        struct async_icount *ic = &edge_port->icount;
-
-        icount->cts = ic->cts;
-        icount->dsr = ic->dsr;
-        icount->rng = ic->rng;
-        icount->dcd = ic->dcd;
-        icount->tx = ic->tx;
-        icount->rx = ic->rx;
-        icount->frame = ic->frame;
-        icount->parity = ic->parity;
-        icount->overrun = ic->overrun;
-        icount->brk = ic->brk;
-        icount->buf_overrun = ic->buf_overrun;
-        return 0;
-}
-
 static int get_serial_info(struct edgeport_port *edge_port,
                                 struct serial_struct __user *retinfo)
 {
@@ -2392,7 +2357,7 @@ static int get_serial_info(struct edgeport_port *edge_port,
 
         cwait = edge_port->port->port.closing_wait;
         if (cwait != ASYNC_CLOSING_WAIT_NONE)
-                cwait = jiffies_to_msecs(closing_wait) / 10;
+                cwait = jiffies_to_msecs(cwait) / 10;
 
         memset(&tmp, 0, sizeof(tmp));
 
@@ -2416,8 +2381,6 @@ static int edge_ioctl(struct tty_struct *tty,
 {
         struct usb_serial_port *port = tty->driver_data;
         struct edgeport_port *edge_port = usb_get_serial_port_data(port);
-        struct async_icount cnow;
-        struct async_icount cprev;
 
         dev_dbg(&port->dev, "%s - port %d, cmd = 0x%x\n", __func__, port->number, cmd);
 
@@ -2426,32 +2389,6 @@ static int edge_ioctl(struct tty_struct *tty,
                 dev_dbg(&port->dev, "%s - TIOCGSERIAL\n", __func__);
                 return get_serial_info(edge_port,
                                 (struct serial_struct __user *) arg);
-        case TIOCMIWAIT:
-                dev_dbg(&port->dev, "%s - TIOCMIWAIT\n", __func__);
-                cprev = edge_port->icount;
-                while (1) {
-                        interruptible_sleep_on(&port->delta_msr_wait);
-                        /* see if a signal did it */
-                        if (signal_pending(current))
-                                return -ERESTARTSYS;
-
-                        if (port->serial->disconnected)
-                                return -EIO;
-
-                        cnow = edge_port->icount;
-                        if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&
-                            cnow.dcd == cprev.dcd && cnow.cts == cprev.cts)
-                                return -EIO; /* no change => error */
-                        if (((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||
-                            ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||
-                            ((arg & TIOCM_CD)  && (cnow.dcd != cprev.dcd)) ||
-                            ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts))) {
-                                return 0;
-                        }
-                        cprev = cnow;
-                }
-                /* not reached */
-                break;
         }
         return -ENOIOCTLCMD;
 }
@@ -2463,8 +2400,6 @@ static void edge_break(struct tty_struct *tty, int break_state)
         int status;
         int bv = 0;     /* Off */
 
-        tty_wait_until_sent(tty, 0);
-
         if (break_state == -1)
                 bv = 1; /* On */
         status = ti_do_config(edge_port, UMPC_SET_CLR_BREAK, bv);
@@ -2546,7 +2481,6 @@ static int edge_port_remove(struct usb_serial_port *port)
         struct edgeport_port *edge_port;
 
         edge_port = usb_get_serial_port_data(port);
-
         edge_remove_sysfs_attrs(port);
         kfifo_free(&edge_port->write_fifo);
         kfree(edge_port);
@@ -2618,7 +2552,8 @@ static struct usb_serial_driver edgeport_1port_device = {
         .set_termios            = edge_set_termios,
         .tiocmget               = edge_tiocmget,
         .tiocmset               = edge_tiocmset,
-        .get_icount             = edge_get_icount,
+        .tiocmiwait             = usb_serial_generic_tiocmiwait,
+        .get_icount             = usb_serial_generic_get_icount,
         .write                  = edge_write,
         .write_room             = edge_write_room,
         .chars_in_buffer        = edge_chars_in_buffer,
@@ -2649,7 +2584,8 @@ static struct usb_serial_driver edgeport_2port_device = {
         .set_termios            = edge_set_termios,
         .tiocmget               = edge_tiocmget,
         .tiocmset               = edge_tiocmset,
-        .get_icount             = edge_get_icount,
+        .tiocmiwait             = usb_serial_generic_tiocmiwait,
+        .get_icount             = usb_serial_generic_get_icount,
         .write                  = edge_write,
         .write_room             = edge_write_room,
         .chars_in_buffer        = edge_chars_in_buffer,