diff options
-rw-r--r-- | drivers/input/serio/hil_mlc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c index 65605e4ef3cf..d66d01c5373b 100644 --- a/drivers/input/serio/hil_mlc.c +++ b/drivers/input/serio/hil_mlc.c | |||
@@ -784,7 +784,7 @@ static void hil_mlcs_process(unsigned long unused) | |||
784 | 784 | ||
785 | /************************* Keepalive timer task *********************/ | 785 | /************************* Keepalive timer task *********************/ |
786 | 786 | ||
787 | static void hil_mlcs_timer(unsigned long data) | 787 | static void hil_mlcs_timer(struct timer_list *unused) |
788 | { | 788 | { |
789 | hil_mlcs_probe = 1; | 789 | hil_mlcs_probe = 1; |
790 | tasklet_schedule(&hil_mlcs_tasklet); | 790 | tasklet_schedule(&hil_mlcs_tasklet); |
@@ -998,7 +998,7 @@ int hil_mlc_unregister(hil_mlc *mlc) | |||
998 | 998 | ||
999 | static int __init hil_mlc_init(void) | 999 | static int __init hil_mlc_init(void) |
1000 | { | 1000 | { |
1001 | setup_timer(&hil_mlcs_kicker, &hil_mlcs_timer, 0); | 1001 | timer_setup(&hil_mlcs_kicker, &hil_mlcs_timer, 0); |
1002 | mod_timer(&hil_mlcs_kicker, jiffies + HZ); | 1002 | mod_timer(&hil_mlcs_kicker, jiffies + HZ); |
1003 | 1003 | ||
1004 | tasklet_enable(&hil_mlcs_tasklet); | 1004 | tasklet_enable(&hil_mlcs_tasklet); |