From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932277AbdJXOS6 (ORCPT ); Tue, 24 Oct 2017 10:18:58 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:43558 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932184AbdJXOSy (ORCPT ); Tue, 24 Oct 2017 10:18:54 -0400 X-Google-Smtp-Source: ABhQp+R6l8rp2pyr2C3ENePPM+sOGX43qOYsdJ3Fvs3Y7QfSAalFROhPJlUn16FPJyBGIVlbqVAbnQ== Date: Tue, 24 Oct 2017 07:18:51 -0700 From: Kees Cook To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] Input: Serio/hil_mlc: Convert timers to use timer_setup() Message-ID: <20171024141851.GA78046@beast> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: linux-input@vger.kernel.org Signed-off-by: Kees Cook --- 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