From: Geliang Tang Date: Tue, 11 Apr 2017 03:38:10 +0000 (-0700) Subject: Input: locomokbd - use setup_timer X-Git-Tag: MMI-PSA29.97-13-9~4395^2~58^2~33 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cfecc1ebdc9315ef6164b396629ff2936dbba0aa;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Input: locomokbd - use setup_timer Use setup_timer() instead of init_timer() to simplify the code. Signed-off-by: Geliang Tang Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c index c94d610b9d78..0d74312d5b02 100644 --- a/drivers/input/keyboard/locomokbd.c +++ b/drivers/input/keyboard/locomokbd.c @@ -264,9 +264,8 @@ static int locomokbd_probe(struct locomo_dev *dev) spin_lock_init(&locomokbd->lock); - init_timer(&locomokbd->timer); - locomokbd->timer.function = locomokbd_timer_callback; - locomokbd->timer.data = (unsigned long) locomokbd; + setup_timer(&locomokbd->timer, locomokbd_timer_callback, + (unsigned long)locomokbd); locomokbd->suspend_jiffies = jiffies;