summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGeliang Tang <geliangtang@gmail.com>2017-04-11 05:37:53 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-04-11 05:41:39 +0200
commitd8f2bed04c9925dc6fc8c1b60c145a044869a82f (patch)
treed61abeaab670bc5284d5f36a66db724b4bdcbfbc /drivers
parentInput: db9 - use setup_timer (diff)
downloadlinux-d8f2bed04c9925dc6fc8c1b60c145a044869a82f.tar.xz
linux-d8f2bed04c9925dc6fc8c1b60c145a044869a82f.zip
Input: gameport - 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')
-rw-r--r--drivers/input/gameport/gameport.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index 092cc4188b57..cedc665364cd 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -542,9 +542,8 @@ static void gameport_init_port(struct gameport *gameport)
INIT_LIST_HEAD(&gameport->node);
spin_lock_init(&gameport->timer_lock);
- init_timer(&gameport->poll_timer);
- gameport->poll_timer.function = gameport_run_poll_handler;
- gameport->poll_timer.data = (unsigned long)gameport;
+ setup_timer(&gameport->poll_timer, gameport_run_poll_handler,
+ (unsigned long)gameport);
}
/*