auxdisplay: Convert timers to use timer_setup()

[mirror_ubuntu-bionic-kernel.git] / drivers / auxdisplay / panel.c

diff --git a/drivers/auxdisplay/panel.c b/drivers/auxdisplay/panel.c
index 6911acd896d935946b3c805d07c88bc03bf41918..ea7869c0d7f9f638ffb33f61d7b2b7437cd3bf41 100644 (file)
--- a/drivers/auxdisplay/panel.c
+++ b/drivers/auxdisplay/panel.c
@@ -1396,7 +1396,7 @@ static void panel_process_inputs(void)
        }
 }
 
-static void panel_scan_timer(void)
+static void panel_scan_timer(struct timer_list *unused)
 {
        if (keypad.enabled && keypad_initialized) {
                if (spin_trylock_irq(&pprt_lock)) {
@@ -1421,7 +1421,7 @@ static void init_scan_timer(void)
        if (scan_timer.function)
                return;         /* already started */
 
-       setup_timer(&scan_timer, (void *)&panel_scan_timer, 0);
+       timer_setup(&scan_timer, panel_scan_timer, 0);
        scan_timer.expires = jiffies + INPUT_POLL_TIME;
        add_timer(&scan_timer);
 }