summaryrefslogtreecommitdiff
path: root/drivers/input/joystick
diff options
context:
space:
mode:
authorGeliang Tang <geliangtang@gmail.com>2017-04-11 06:38:30 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-04-11 06:41:40 +0300
commitbee84493318843ffba9705924469369b9b244ddf (patch)
tree0c7707953ea1dc5c9a0516fdcea214dffce2ee40 /drivers/input/joystick
parentcfecc1ebdc9315ef6164b396629ff2936dbba0aa (diff)
downloadlinux-bee84493318843ffba9705924469369b9b244ddf.tar.xz
Input: turbografx - 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>
Diffstat (limited to 'drivers/input/joystick')
-rw-r--r--drivers/input/joystick/turbografx.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c
index 77f575dd0901..a1fdc75a438d 100644
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@ -200,9 +200,7 @@ static void tgfx_attach(struct parport *pp)
mutex_init(&tgfx->sem);
tgfx->pd = pd;
tgfx->parportno = pp->number;
- init_timer(&tgfx->timer);
- tgfx->timer.data = (long) tgfx;
- tgfx->timer.function = tgfx_timer;
+ setup_timer(&tgfx->timer, tgfx_timer, (long)tgfx);
for (i = 0; i < n_devs; i++) {
if (n_buttons[i] < 1)