summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorJakub Kicinski <kubakici@wp.pl>2015-05-29 22:20:30 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-01 00:47:27 +0300
commitdbe5a40cba2de69678401362b7cc9bbbe7bc30be (patch)
tree08ec169b9234057ec725edef3dc53ceeaa57f72d /drivers/tty
parent9e6f4ca3e567d5d9e4133d2da8bae8f476f85873 (diff)
downloadlinux-dbe5a40cba2de69678401362b7cc9bbbe7bc30be.tar.xz
sc16is7xx: move RTS delay to workqueue
Instead of spinning under port->lock let's just sleep inside the kthread. It should be equivalent as TX cannot proceed when thread is blocked. Signed-off-by: Jakub Kicinski <kubakici@wp.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/sc16is7xx.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index e6553d04a551..8247bce5f4ad 100644
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -650,9 +650,13 @@ static irqreturn_t sc16is7xx_irq(int irq, void *dev_id)
static void sc16is7xx_tx_proc(struct kthread_work *ws)
{
- struct sc16is7xx_one *one = to_sc16is7xx_one(ws, tx_work);
+ struct uart_port *port = &(to_sc16is7xx_one(ws, tx_work)->port);
- sc16is7xx_handle_tx(&one->port);
+ if ((port->rs485.flags & SER_RS485_ENABLED) &&
+ (port->rs485.delay_rts_before_send > 0))
+ msleep(port->rs485.delay_rts_before_send);
+
+ sc16is7xx_handle_tx(port);
}
static void sc16is7xx_stop_tx(struct uart_port* port)
@@ -677,12 +681,6 @@ static void sc16is7xx_start_tx(struct uart_port *port)
struct sc16is7xx_port *s = dev_get_drvdata(port->dev);
struct sc16is7xx_one *one = to_sc16is7xx_one(port, port);
- /* handle rs485 */
- if ((port->rs485.flags & SER_RS485_ENABLED) &&
- (port->rs485.delay_rts_before_send > 0)) {
- mdelay(port->rs485.delay_rts_before_send);
- }
-
queue_kthread_work(&s->kworker, &one->tx_work);
}