Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <[email protected]>
---
 drivers/tty/serial/sa1100.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/tty/serial/sa1100.c b/drivers/tty/serial/sa1100.c
index fd3d132..75bd1e0 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]);
        }
 
        /*
-- 
2.7.4

Reply via email to