[PATCH] Char: timers cleanup

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / char / n_r3964.c

diff --git a/drivers/char/n_r3964.c b/drivers/char/n_r3964.c
index fab1b7d42858ad5a258863a84b43cf12e150f500..65f2d3a96b85dd80e9400e9c730482596f009e9f 100644 (file)
--- a/drivers/char/n_r3964.c
+++ b/drivers/char/n_r3964.c
@@ -1005,9 +1005,7 @@ static int r3964_open(struct tty_struct *tty)
        tty->disc_data = pInfo;
        tty->receive_room = 65536;
 
-       init_timer(&pInfo->tmr);
-       pInfo->tmr.data = (unsigned long)pInfo;
-       pInfo->tmr.function = on_timeout;
+       setup_timer(&pInfo->tmr, on_timeout, (unsigned long)pInfo);
 
        return 0;
 }