USB: f81232: switch to generic tiocmiwait

Switch to generic tiocmiwait rather than rely on a custom implementation
using racy interruptible_sleep_on().

Note that this driver is mostly stubbed out so neither version of
tiocmiwait will actually work until someone implements
f81232_update_line_status().

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index 42c55601b4c9df9b532100dd2706b5dd0487d298..1e012fbe7e020bafea8765c3d6922c6716e8b684 100644 (file)
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -56,7 +56,7 @@ static void f81232_update_line_status(struct usb_serial_port *port,
                                      unsigned int actual_length)
 {
        /*
-        * FIXME: Call
+        * FIXME: Update port->icount, and call
         *
         *              wake_up_interruptible(&port->port.delta_msr_wait);
         *
@@ -247,46 +247,6 @@ static int f81232_carrier_raised(struct usb_serial_port *port)
        return 0;
 }
 
-static int f81232_tiocmiwait(struct tty_struct *tty, unsigned long arg)
-{
-       struct usb_serial_port *port = tty->driver_data;
-       struct f81232_private *priv = usb_get_serial_port_data(port);
-       unsigned long flags;
-       unsigned int prevstatus;
-       unsigned int status;
-       unsigned int changed;
-
-       spin_lock_irqsave(&priv->lock, flags);
-       prevstatus = priv->line_status;
-       spin_unlock_irqrestore(&priv->lock, flags);
-
-       while (1) {
-               interruptible_sleep_on(&port->port.delta_msr_wait);
-               /* see if a signal did it */
-               if (signal_pending(current))
-                       return -ERESTARTSYS;
-
-               if (port->serial->disconnected)
-                       return -EIO;
-
-               spin_lock_irqsave(&priv->lock, flags);
-               status = priv->line_status;
-               spin_unlock_irqrestore(&priv->lock, flags);
-
-               changed = prevstatus ^ status;
-
-               if (((arg & TIOCM_RNG) && (changed & UART_RING)) ||
-                   ((arg & TIOCM_DSR) && (changed & UART_DSR)) ||
-                   ((arg & TIOCM_CD)  && (changed & UART_DCD)) ||
-                   ((arg & TIOCM_CTS) && (changed & UART_CTS))) {
-                       return 0;
-               }
-               prevstatus = status;
-       }
-       /* NOTREACHED */
-       return 0;
-}
-
 static int f81232_ioctl(struct tty_struct *tty,
                        unsigned int cmd, unsigned long arg)
 {
@@ -356,7 +316,7 @@ static struct usb_serial_driver f81232_device = {
        .set_termios =          f81232_set_termios,
        .tiocmget =             f81232_tiocmget,
        .tiocmset =             f81232_tiocmset,
-       .tiocmiwait =           f81232_tiocmiwait,
+       .tiocmiwait =           usb_serial_generic_tiocmiwait,
        .process_read_urb =     f81232_process_read_urb,
        .read_int_callback =    f81232_read_int_callback,
        .port_probe =           f81232_port_probe,