From c7e37585f3af95ef72a883c1f8d93de6497fde75 Mon Sep 17 00:00:00 2001 From: Stuart Longland Date: Sun, 5 Mar 2017 10:53:33 +1000 Subject: [PATCH] serial_core: Drop references to `state->tlet` As per 6a3e492b6daaf7ec4dc41e51d87d2aae8ff886f2. --- 3.x/serial_core.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/3.x/serial_core.c b/3.x/serial_core.c index 4cd93bb..8d79849 100644 --- a/3.x/serial_core.c +++ b/3.x/serial_core.c @@ -69,7 +69,7 @@ void adv_uart_write_wakeup(struct uart_port *port) * closed. No cookie for you. */ BUG_ON(!state); - tasklet_schedule(&state->tlet); + tty_wakeup(state->port.tty); } static void uart_stop(struct tty_struct *tty) @@ -104,12 +104,6 @@ static void uart_start(struct tty_struct *tty) spin_unlock_irqrestore(&port->lock, flags); } -static void uart_tasklet_action(unsigned long data) -{ - struct uart_state *state = (struct uart_state *)data; - tty_wakeup(state->port.tty); -} - static inline void uart_update_mctrl(struct uart_port *port, unsigned int set, unsigned int clear) { @@ -246,11 +240,6 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state) synchronize_irq(uport->irq); } - /* - * kill off our tasklet - */ - tasklet_kill(&state->tlet); - /* * Free the transmit buffer page. */ @@ -2296,8 +2285,6 @@ int adv_uart_register_driver(struct uart_driver *drv) port->ops = &uart_port_ops; port->close_delay = 500; /* .5 seconds */ port->closing_wait = 30000; /* 30 seconds */ - tasklet_init(&state->tlet, uart_tasklet_action, - (unsigned long)state); } retval = tty_register_driver(normal); @@ -2458,11 +2445,6 @@ int adv_uart_remove_one_port(struct uart_driver *drv, struct uart_port *uport) */ uport->type = PORT_UNKNOWN; - /* - * Kill the tasklet, and free resources. - */ - tasklet_kill(&state->tlet); - state->uart_port = NULL; mutex_unlock(&port_mutex);