From: Allen Pais Date: Fri, 22 Sep 2017 08:26:49 +0000 (+0530) Subject: drivers: tty: sa1100: use setup_timer() helper. X-Git-Tag: Ubuntu-5.10.0-12.13~9056^2~85 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3b837fa233254c7f8e46fbb72e4c126774fdb635;p=mirror_ubuntu-hirsute-kernel.git drivers: tty: sa1100: use setup_timer() helper. Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Allen Pais Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/sa1100.c b/drivers/tty/serial/sa1100.c index fd3d1329d48c..75bd1e058b87 100644 --- a/drivers/tty/serial/sa1100.c +++ b/drivers/tty/serial/sa1100.c @@ -640,9 +640,8 @@ static void __init sa1100_init_ports(void) sa1100_ports[i].port.fifosize = 8; sa1100_ports[i].port.line = i; sa1100_ports[i].port.iotype = UPIO_MEM; - init_timer(&sa1100_ports[i].timer); - sa1100_ports[i].timer.function = sa1100_timeout; - sa1100_ports[i].timer.data = (unsigned long)&sa1100_ports[i]; + setup_timer(&sa1100_ports[i].timer, sa1100_timeout, + (unsigned long)&sa1100_ports[i]); } /*