Switch to the generic TIOCMIWAIT implementation.
Signed-off-by: Johan Hovold <[email protected]>
---
drivers/usb/serial/mos7840.c | 48 ++------------------------------------------
1 file changed, 2 insertions(+), 46 deletions(-)
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index bdf57d3..c385705 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -219,8 +219,6 @@ struct moschip_port {
char open;
char open_ports;
wait_queue_head_t wait_chase; /* for handling sleeping while waiting
for chase to finish */
- wait_queue_head_t delta_msr_wait; /* for handling sleeping while
waiting for msr change to happen */
- int delta_msr_cond;
struct usb_serial_port *port; /* loop back to the owner of this
object */
/* Offsets */
@@ -414,8 +412,7 @@ static void mos7840_handle_new_msr(struct moschip_port
*port, __u8 new_msr)
if (new_msr & MOS_MSR_DELTA_RI)
icount->rng++;
- mos7840_port->delta_msr_cond = 1;
- wake_up(&mos7840_port->delta_msr_wait);
+ wake_up(&mos7840_port->port->delta_msr_wait);
}
}
@@ -1111,7 +1108,6 @@ static int mos7840_open(struct tty_struct *tty, struct
usb_serial_port *port)
/* initialize our wait queues */
init_waitqueue_head(&mos7840_port->wait_chase);
- init_waitqueue_head(&mos7840_port->delta_msr_wait);
/* initialize our port settings */
/* Must set to enable ints! */
@@ -2116,9 +2112,6 @@ static int mos7840_ioctl(struct tty_struct *tty,
struct usb_serial_port *port = tty->driver_data;
void __user *argp = (void __user *)arg;
struct moschip_port *mos7840_port;
- unsigned long flags;
- struct async_icount cnow;
- struct async_icount cprev;
if (mos7840_port_paranoia_check(port, __func__))
return -1;
@@ -2144,42 +2137,6 @@ static int mos7840_ioctl(struct tty_struct *tty,
case TIOCSSERIAL:
dev_dbg(&port->dev, "%s TIOCSSERIAL\n", __func__);
break;
-
- case TIOCMIWAIT:
- dev_dbg(&port->dev, "%s TIOCMIWAIT\n", __func__);
- spin_lock_irqsave(&port->lock, flags);
- cprev = port->icount;
- spin_unlock_irqrestore(&port->lock, flags);
- while (1) {
- /*
interruptible_sleep_on(&mos7840_port->delta_msr_wait); */
- mos7840_port->delta_msr_cond = 0;
- wait_event_interruptible(mos7840_port->delta_msr_wait,
- (port->serial->disconnected ||
- mos7840_port->
- delta_msr_cond == 1));
-
- /* see if a signal did it */
- if (signal_pending(current))
- return -ERESTARTSYS;
-
- if (port->serial->disconnected)
- return -EIO;
-
- spin_lock_irqsave(&port->lock, flags);
- cnow = port->icount;
- spin_unlock_irqrestore(&port->lock, flags);
-
- 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;
- }
- /* NOTREACHED */
- break;
-
default:
break;
}
@@ -2486,8 +2443,6 @@ static int mos7840_port_remove(struct usb_serial_port
*port)
mos7840_port = mos7840_get_port_private(port);
- wake_up(&mos7840_port->delta_msr_wait);
-
if (mos7840_port->has_led) {
/* Turn off LED */
mos7840_set_led_sync(port, MODEM_CONTROL_REGISTER, 0x0300);
@@ -2528,6 +2483,7 @@ static struct usb_serial_driver moschip7840_4port_device
= {
.break_ctl = mos7840_break,
.tiocmget = mos7840_tiocmget,
.tiocmset = mos7840_tiocmset,
+ .tiocmiwait = usb_serial_generic_tiocmiwait,
.get_icount = usb_serial_generic_get_icount,
.port_probe = mos7840_port_probe,
.port_remove = mos7840_port_remove,
--
1.8.1.1
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
