openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Kees Cook <keescook@chromium.org>
Acked-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kees Cook 2017-10-24 03:00:03 -07:00 committed by Greg Kroah-Hartman
parent a8497b31fe
commit 026cb4329d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/tty/serial/atmel_serial.c
View File

@ -1185,10 +1185,11 @@ static int atmel_prepare_rx_dma(struct uart_port *port)
return -EINVAL; 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 = from_timer(atmel_port, t,
struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); uart_timer);
struct uart_port *port = &atmel_port->uart;
if (!atomic_read(&atmel_port->tasklet_shutdown)) { if (!atomic_read(&atmel_port->tasklet_shutdown)) {
tasklet_schedule(&atmel_port->tasklet_rx); 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_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN | ATMEL_US_RXEN);
atmel_port->tx_stopped = false; atmel_port->tx_stopped = false;
setup_timer(&atmel_port->uart_timer, timer_setup(&atmel_port->uart_timer, atmel_uart_timer_callback, 0);
atmel_uart_timer_callback,
(unsigned long)port);
if (atmel_use_pdc_rx(port)) { if (atmel_use_pdc_rx(port)) {
/* set UART timeout */ /* set UART timeout */