diff options
| author | Jan Stourac <xstourac@gmail.com> | 2017-02-08 16:43:59 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2017-02-08 16:43:59 +0100 |
| commit | cd7b917c98d6775fd1cb1eac84f5f1ea97b16e79 (patch) | |
| tree | add64f4fe47688cc909256d3e65bc0f38c29314f /drivers/video | |
| parent | fbdev: omap/lcd: Make callbacks optional (diff) | |
| download | linux-cd7b917c98d6775fd1cb1eac84f5f1ea97b16e79.tar.xz linux-cd7b917c98d6775fd1cb1eac84f5f1ea97b16e79.zip | |
video/console: use setup_timer and mod_timer instead of init_timer
Use setup_timer and mod_timer functions instead of initializing timer with
the function init_timer and data fields.
Signed-off-by: Jan Stourac <xstourac@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/console/fbcon.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index f4daadff8a6c..12ded23f1aaf 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -412,11 +412,9 @@ static void fbcon_add_cursor_timer(struct fb_info *info) if (!info->queue.func) INIT_WORK(&info->queue, fb_flashcursor); - init_timer(&ops->cursor_timer); - ops->cursor_timer.function = cursor_timer_handler; - ops->cursor_timer.expires = jiffies + ops->cur_blink_jiffies; - ops->cursor_timer.data = (unsigned long ) info; - add_timer(&ops->cursor_timer); + setup_timer(&ops->cursor_timer, cursor_timer_handler, + (unsigned long) info); + mod_timer(&ops->cursor_timer, jiffies + ops->cur_blink_jiffies); ops->flags |= FBCON_FLAGS_CURSOR_TIMER; } } |