mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
tty/serial: altera_uart: 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: Tobias Klauser <[email protected]> Cc: Jiri Slaby <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Kees Cook <[email protected]> Acked-by: Tobias Klauser <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
fc3b00d7dd
commit
ad0cda7a90
1 changed files with 4 additions and 4 deletions
|
|
@ -288,10 +288,10 @@ static irqreturn_t altera_uart_interrupt(int irq, void *data)
|
|||
return IRQ_RETVAL(isr);
|
||||
}
|
||||
|
||||
static void altera_uart_timer(unsigned long data)
|
||||
static void altera_uart_timer(struct timer_list *t)
|
||||
{
|
||||
struct uart_port *port = (void *)data;
|
||||
struct altera_uart *pp = container_of(port, struct altera_uart, port);
|
||||
struct altera_uart *pp = from_timer(pp, t, tmr);
|
||||
struct uart_port *port = &pp->port;
|
||||
|
||||
altera_uart_interrupt(0, port);
|
||||
mod_timer(&pp->tmr, jiffies + uart_poll_timeout(port));
|
||||
|
|
@ -314,7 +314,7 @@ static int altera_uart_startup(struct uart_port *port)
|
|||
int ret;
|
||||
|
||||
if (!port->irq) {
|
||||
setup_timer(&pp->tmr, altera_uart_timer, (unsigned long)port);
|
||||
timer_setup(&pp->tmr, altera_uart_timer, 0);
|
||||
mod_timer(&pp->tmr, jiffies + uart_poll_timeout(port));
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue