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

Commit 026cb432 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

tty/serial: atmel: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Richard Genoud <richard.genoud@gmail.com>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: linux-serial@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarRichard Genoud <richard.genoud@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a8497b31

drivers/tty/serial/atmel_serial.c

+5 −6
Original line number Diff line number Diff line
@@ -1185,10 +1185,11 @@ static int atmel_prepare_rx_dma(struct uart_port *port) 
	return -EINVAL;

}



static void atmel_uart_timer_callback(unsigned long data)

static void atmel_uart_timer_callback(struct timer_list *t)

{

	struct uart_port *port = (void *)data;

	struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);

	struct atmel_uart_port *atmel_port = from_timer(atmel_port, t,

							uart_timer);

	struct uart_port *port = &atmel_port->uart;



	if (!atomic_read(&atmel_port->tasklet_shutdown)) {

		tasklet_schedule(&atmel_port->tasklet_rx);
@@ -1852,9 +1853,7 @@ static int atmel_startup(struct uart_port *port) 
	atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN | ATMEL_US_RXEN);

	atmel_port->tx_stopped = false;



	setup_timer(&atmel_port->uart_timer,

			atmel_uart_timer_callback,

			(unsigned long)port);

	timer_setup(&atmel_port->uart_timer, atmel_uart_timer_callback, 0);



	if (atmel_use_pdc_rx(port)) {

		/* set UART timeout */