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

Commit e176058f authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: Abstract tty buffer work 



Introduce API functions to restart and cancel tty buffer work, rather
than manipulate buffer work directly.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4b41b953

drivers/tty/n_tty.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static void n_tty_kick_worker(struct tty_struct *tty) 
		 */

		WARN_RATELIMIT(test_bit(TTY_LDISC_HALTED, &tty->flags),

			       "scheduling buffer work for halted ldisc\n");

		queue_work(system_unbound_wq, &tty->port->buf.work);

		tty_buffer_restart_work(tty->port);

	}

}

drivers/tty/tty_buffer.c

+10 −0
Original line number Diff line number Diff line
@@ -587,3 +587,13 @@ void tty_buffer_set_lock_subclass(struct tty_port *port) 
{

	lockdep_set_subclass(&port->buf.lock, TTY_LOCK_SLAVE);

}



bool tty_buffer_restart_work(struct tty_port *port)

{

	return queue_work(system_unbound_wq, &port->buf.work);

}



bool tty_buffer_cancel_work(struct tty_port *port)

{

	return cancel_work_sync(&port->buf.work);

}

drivers/tty/tty_io.c

+1 −1
Original line number Diff line number Diff line
@@ -1689,7 +1689,7 @@ static void release_tty(struct tty_struct *tty, int idx) 
	tty->port->itty = NULL;

	if (tty->link)

		tty->link->port->itty = NULL;

	cancel_work_sync(&tty->port->buf.work);

	tty_buffer_cancel_work(tty->port);



	tty_kref_put(tty->link);

	tty_kref_put(tty);

drivers/tty/tty_port.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ EXPORT_SYMBOL(tty_port_free_xmit_buf); 
 */

void tty_port_destroy(struct tty_port *port)

{

	cancel_work_sync(&port->buf.work);

	tty_buffer_cancel_work(port);

	tty_buffer_free_all(port);

}

EXPORT_SYMBOL(tty_port_destroy);

include/linux/tty.h

+2 −0
Original line number Diff line number Diff line
@@ -467,6 +467,8 @@ extern void tty_buffer_free_all(struct tty_port *port); 
extern void tty_buffer_flush(struct tty_struct *tty, struct tty_ldisc *ld);

extern void tty_buffer_init(struct tty_port *port);

extern void tty_buffer_set_lock_subclass(struct tty_port *port);

extern bool tty_buffer_restart_work(struct tty_port *port);

extern bool tty_buffer_cancel_work(struct tty_port *port);

extern speed_t tty_termios_baud_rate(struct ktermios *termios);

extern speed_t tty_termios_input_baud_rate(struct ktermios *termios);

extern void tty_termios_encode_baud_rate(struct ktermios *termios,