summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeliang Tang <geliangtang@gmail.com>2017-04-10 20:38:10 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-04-10 20:41:40 -0700
commitcfecc1ebdc9315ef6164b396629ff2936dbba0aa (patch)
tree881d050b695dab6f94f105d7c07525762b5ae718
parentd8f2bed04c9925dc6fc8c1b60c145a044869a82f (diff)
downloadlinux-cfecc1ebdc9315ef6164b396629ff2936dbba0aa.tar.bz2
Input: locomokbd - use setup_timer
Use setup_timer() instead of init_timer() to simplify the code. Signed-off-by: Geliang Tang <geliangtang@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/keyboard/locomokbd.c5
1 files changed, 2 insertions, 3 deletions
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;