diff options
author | Peter Hurley <peter@hurleysoftware.com> | 2014-09-10 15:06:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-24 00:19:35 -0400 |
commit | d95e3caea2d1424dfdec30b46bd94087da94f928 (patch) | |
tree | ef9fe27c97e1a4b8beba0a8d5f41b226f9ec2b57 /drivers/usb | |
parent | d01f4d181c92877ecc678adce248a30cb7077ff1 (diff) |
usb: serial: Remove unused tty->hw_stopped
The tty core does not test tty->hw_stopped; remove from drivers
which don't test it themselves.
Acked-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/serial/digi_acceleport.c | 7 | ||||
-rw-r--r-- | drivers/usb/serial/io_ti.c | 7 | ||||
-rw-r--r-- | drivers/usb/serial/ti_usb_3410_5052.c | 7 |
3 files changed, 3 insertions, 18 deletions
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index 8a23c53b946e..12b0e67473ba 100644 --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c | |||
@@ -834,7 +834,6 @@ static void digi_set_termios(struct tty_struct *tty, | |||
834 | arg |= DIGI_OUTPUT_FLOW_CONTROL_CTS; | 834 | arg |= DIGI_OUTPUT_FLOW_CONTROL_CTS; |
835 | } else { | 835 | } else { |
836 | arg &= ~DIGI_OUTPUT_FLOW_CONTROL_CTS; | 836 | arg &= ~DIGI_OUTPUT_FLOW_CONTROL_CTS; |
837 | tty->hw_stopped = 0; | ||
838 | } | 837 | } |
839 | 838 | ||
840 | buf[i++] = DIGI_CMD_SET_OUTPUT_FLOW_CONTROL; | 839 | buf[i++] = DIGI_CMD_SET_OUTPUT_FLOW_CONTROL; |
@@ -1500,15 +1499,11 @@ static int digi_read_oob_callback(struct urb *urb) | |||
1500 | if (val & DIGI_READ_INPUT_SIGNALS_CTS) { | 1499 | if (val & DIGI_READ_INPUT_SIGNALS_CTS) { |
1501 | priv->dp_modem_signals |= TIOCM_CTS; | 1500 | priv->dp_modem_signals |= TIOCM_CTS; |
1502 | /* port must be open to use tty struct */ | 1501 | /* port must be open to use tty struct */ |
1503 | if (rts) { | 1502 | if (rts) |
1504 | tty->hw_stopped = 0; | ||
1505 | tty_port_tty_wakeup(&port->port); | 1503 | tty_port_tty_wakeup(&port->port); |
1506 | } | ||
1507 | } else { | 1504 | } else { |
1508 | priv->dp_modem_signals &= ~TIOCM_CTS; | 1505 | priv->dp_modem_signals &= ~TIOCM_CTS; |
1509 | /* port must be open to use tty struct */ | 1506 | /* port must be open to use tty struct */ |
1510 | if (rts) | ||
1511 | tty->hw_stopped = 1; | ||
1512 | } | 1507 | } |
1513 | if (val & DIGI_READ_INPUT_SIGNALS_DSR) | 1508 | if (val & DIGI_READ_INPUT_SIGNALS_DSR) |
1514 | priv->dp_modem_signals |= TIOCM_DSR; | 1509 | priv->dp_modem_signals |= TIOCM_DSR; |
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index c0a42e9e6777..ddbb8fe1046d 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
@@ -1456,12 +1456,8 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 msr) | |||
1456 | tty = tty_port_tty_get(&edge_port->port->port); | 1456 | tty = tty_port_tty_get(&edge_port->port->port); |
1457 | /* handle CTS flow control */ | 1457 | /* handle CTS flow control */ |
1458 | if (tty && C_CRTSCTS(tty)) { | 1458 | if (tty && C_CRTSCTS(tty)) { |
1459 | if (msr & EDGEPORT_MSR_CTS) { | 1459 | if (msr & EDGEPORT_MSR_CTS) |
1460 | tty->hw_stopped = 0; | ||
1461 | tty_wakeup(tty); | 1460 | tty_wakeup(tty); |
1462 | } else { | ||
1463 | tty->hw_stopped = 1; | ||
1464 | } | ||
1465 | } | 1461 | } |
1466 | tty_kref_put(tty); | 1462 | tty_kref_put(tty); |
1467 | } | 1463 | } |
@@ -2177,7 +2173,6 @@ static void change_port_settings(struct tty_struct *tty, | |||
2177 | dev_dbg(dev, "%s - RTS/CTS is enabled\n", __func__); | 2173 | dev_dbg(dev, "%s - RTS/CTS is enabled\n", __func__); |
2178 | } else { | 2174 | } else { |
2179 | dev_dbg(dev, "%s - RTS/CTS is disabled\n", __func__); | 2175 | dev_dbg(dev, "%s - RTS/CTS is disabled\n", __func__); |
2180 | tty->hw_stopped = 0; | ||
2181 | restart_read(edge_port); | 2176 | restart_read(edge_port); |
2182 | } | 2177 | } |
2183 | 2178 | ||
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index 3dd3ff8c50d3..e9da41d9fe7f 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c | |||
@@ -773,7 +773,6 @@ static void ti_set_termios(struct tty_struct *tty, | |||
773 | config->wFlags |= TI_UART_ENABLE_RTS_IN; | 773 | config->wFlags |= TI_UART_ENABLE_RTS_IN; |
774 | config->wFlags |= TI_UART_ENABLE_CTS_OUT; | 774 | config->wFlags |= TI_UART_ENABLE_CTS_OUT; |
775 | } else { | 775 | } else { |
776 | tty->hw_stopped = 0; | ||
777 | ti_restart_read(tport, tty); | 776 | ti_restart_read(tport, tty); |
778 | } | 777 | } |
779 | 778 | ||
@@ -1291,12 +1290,8 @@ static void ti_handle_new_msr(struct ti_port *tport, __u8 msr) | |||
1291 | /* handle CTS flow control */ | 1290 | /* handle CTS flow control */ |
1292 | tty = tty_port_tty_get(&tport->tp_port->port); | 1291 | tty = tty_port_tty_get(&tport->tp_port->port); |
1293 | if (tty && C_CRTSCTS(tty)) { | 1292 | if (tty && C_CRTSCTS(tty)) { |
1294 | if (msr & TI_MSR_CTS) { | 1293 | if (msr & TI_MSR_CTS) |
1295 | tty->hw_stopped = 0; | ||
1296 | tty_wakeup(tty); | 1294 | tty_wakeup(tty); |
1297 | } else { | ||
1298 | tty->hw_stopped = 1; | ||
1299 | } | ||
1300 | } | 1295 | } |
1301 | tty_kref_put(tty); | 1296 | tty_kref_put(tty); |
1302 | } | 1297 | } |