From: Jan Stourac <xstourac@gmail.com>
Date: Wed, 8 Feb 2017 15:43:59 +0000 (+0100)
Subject: video/console: use setup_timer and mod_timer instead of init_timer
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cd7b917c98d6775fd1cb1eac84f5f1ea97b16e79;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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;
 	}
 }