From: Geliang Tang Date: Tue, 11 Apr 2017 03:37:40 +0000 (-0700) Subject: Input: db9 - use setup_timer X-Git-Tag: MMI-PSA29.97-13-9~4395^2~58^2~35 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c9a9b72f34bf67a49743b26ab1f94c1349a389ad;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Input: db9 - 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/joystick/db9.c b/drivers/input/joystick/db9.c index da326090c2b0..f4ad83eab67f 100644 --- a/drivers/input/joystick/db9.c +++ b/drivers/input/joystick/db9.c @@ -609,9 +609,7 @@ static void db9_attach(struct parport *pp) db9->pd = pd; db9->mode = mode; db9->parportno = pp->number; - init_timer(&db9->timer); - db9->timer.data = (long) db9; - db9->timer.function = db9_timer; + setup_timer(&db9->timer, db9_timer, (long)db9); for (i = 0; i < (min(db9_mode->n_pads, DB9_MAX_DEVICES)); i++) {