diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-24 09:44:15 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-10-24 10:09:51 -0700 |
| commit | ded489d43f1b210bf3a75f65bfa742fbce0e8bcc (patch) | |
| tree | 4ae3a40b2e062af6d964d9656d64cc5c69a3818c /drivers/input/serio | |
| parent | a4f60b5047b155029edbef0ef0006bb8c8c83ba3 (diff) | |
| download | blackbird-op-linux-ded489d43f1b210bf3a75f65bfa742fbce0e8bcc.tar.gz blackbird-op-linux-ded489d43f1b210bf3a75f65bfa742fbce0e8bcc.zip | |
Input: hil_mlc - convert to using 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.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/serio')
| -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) /************************* Keepalive timer task *********************/ -static void hil_mlcs_timer(unsigned long data) +static void hil_mlcs_timer(struct timer_list *unused) { hil_mlcs_probe = 1; tasklet_schedule(&hil_mlcs_tasklet); @@ -998,7 +998,7 @@ int hil_mlc_unregister(hil_mlc *mlc) static int __init hil_mlc_init(void) { - setup_timer(&hil_mlcs_kicker, &hil_mlcs_timer, 0); + timer_setup(&hil_mlcs_kicker, &hil_mlcs_timer, 0); mod_timer(&hil_mlcs_kicker, jiffies + HZ); tasklet_enable(&hil_mlcs_tasklet); |
