Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbe5a40c authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Greg Kroah-Hartman
Browse files

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: default avatarJakub Kicinski <kubakici@wp.pl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e6f4ca3

drivers/tty/serial/sc16is7xx.c

+6 −8
Original line number Diff line number Diff line
@@ -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);

}