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

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

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 <tklauser@distanz.ch>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: linux-serial@vger.kernel.org
Cc: nios2-dev@lists.rocketboards.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fc3b00d7

drivers/tty/serial/altera_uart.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}