lkml.org 
[lkml]   [2017]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: Jiri Slaby <jslaby@suse.com>
    Cc: linux-serial@vger.kernel.org
    Signed-off-by: Kees Cook <keescook@chromium.org>
    ---
    drivers/tty/serial/atmel_serial.c | 11 +++++------
    1 file changed, 5 insertions(+), 6 deletions(-)

    diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
    index 82d9c8eae04f..68d8685e5a50 100644
    --- a/drivers/tty/serial/atmel_serial.c
    +++ b/drivers/tty/serial/atmel_serial.c
    @@ -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 */
    --
    2.7.4

    --
    Kees Cook
    Pixel Security

    \
     
     \ /
      Last update: 2017-10-24 12:02    [W:3.669 / U:0.488 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site