On Tue, Oct 24, 2017 at 07:18:51AM -0700, Kees Cook wrote:
> 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.
>
> Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> Cc: linux-input@xxxxxxxxxxxxxxx
> Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
Applied, thank you.
> ---
> drivers/input/serio/hil_mlc.c | 4 ++--
> 1 file 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);
> --
> 2.7.4
>
>
> --
> Kees Cook
> Pixel Security
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
