Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangt...@gmail.com>
---
 drivers/input/keyboard/locomokbd.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/input/keyboard/locomokbd.c 
b/drivers/input/keyboard/locomokbd.c
index c94d610..0d74312d 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;
 
-- 
2.9.3

Reply via email to