aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-03-21 07:37:04 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-25 16:50:52 -0400
commita7fa57742ea692631a4076254408366a01eb3582 (patch)
treec50f4ceeaddd50011ec1eccd010ccdb5d2830530
parentc648e94ebfc7701f4d0c79dce959134f02f24ce7 (diff)
USB: digi_acceleport: remove unused MSR-wait queue
Remove unused, private modem-status wait queue from driver. If TIOCMIWAIT is ever implemented it must not rely on a private wait queue which may have been released when woken up. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/digi_acceleport.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 76a8c202a8e2..32873b406402 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -196,7 +196,6 @@ struct digi_port {
196 unsigned char dp_out_buf[DIGI_OUT_BUF_SIZE]; 196 unsigned char dp_out_buf[DIGI_OUT_BUF_SIZE];
197 int dp_write_urb_in_use; 197 int dp_write_urb_in_use;
198 unsigned int dp_modem_signals; 198 unsigned int dp_modem_signals;
199 wait_queue_head_t dp_modem_change_wait;
200 int dp_transmit_idle; 199 int dp_transmit_idle;
201 wait_queue_head_t dp_transmit_idle_wait; 200 wait_queue_head_t dp_transmit_idle_wait;
202 int dp_throttled; 201 int dp_throttled;
@@ -1250,7 +1249,6 @@ static int digi_port_init(struct usb_serial_port *port, unsigned port_num)
1250 1249
1251 spin_lock_init(&priv->dp_port_lock); 1250 spin_lock_init(&priv->dp_port_lock);
1252 priv->dp_port_num = port_num; 1251 priv->dp_port_num = port_num;
1253 init_waitqueue_head(&priv->dp_modem_change_wait);
1254 init_waitqueue_head(&priv->dp_transmit_idle_wait); 1252 init_waitqueue_head(&priv->dp_transmit_idle_wait);
1255 init_waitqueue_head(&priv->dp_flush_wait); 1253 init_waitqueue_head(&priv->dp_flush_wait);
1256 init_waitqueue_head(&priv->dp_close_wait); 1254 init_waitqueue_head(&priv->dp_close_wait);
@@ -1541,7 +1539,6 @@ static int digi_read_oob_callback(struct urb *urb)
1541 else 1539 else
1542 priv->dp_modem_signals &= ~TIOCM_CD; 1540 priv->dp_modem_signals &= ~TIOCM_CD;
1543 1541
1544 wake_up_interruptible(&priv->dp_modem_change_wait);
1545 spin_unlock(&priv->dp_port_lock); 1542 spin_unlock(&priv->dp_port_lock);
1546 } else if (opcode == DIGI_CMD_TRANSMIT_IDLE) { 1543 } else if (opcode == DIGI_CMD_TRANSMIT_IDLE) {
1547 spin_lock(&priv->dp_port_lock); 1544 spin_lock(&priv->dp_port_lock);