From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Kees Cook <keescook@chromium.org>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Input: Serio/hil_mlc: Convert timers to use timer_setup()
Date: Tue, 24 Oct 2017 10:05:03 -0700 [thread overview]
Message-ID: <20171024170503.vgh3jqlewdrdc36j@dtor-ws> (raw)
In-Reply-To: <20171024141851.GA78046@beast>
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@gmail.com>
> Cc: linux-input@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
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
prev parent reply other threads:[~2017-10-24 17:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-24 14:18 [PATCH] Input: Serio/hil_mlc: Convert timers to use timer_setup() Kees Cook
2017-10-24 17:05 ` Dmitry Torokhov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171024170503.vgh3jqlewdrdc36j@dtor-ws \
--to=dmitry.torokhov@gmail.com \
--cc=keescook@chromium.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox