Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[sfrench/cifs-2.6.git] / drivers / s390 / char / sclp_con.c

diff --git a/drivers/s390/char/sclp_con.c b/drivers/s390/char/sclp_con.c
index 6037bc87e767380695a0ebe09b0fcb78ee2d69ea..7027e61a6931028a2f2e5230110493f9659eb305 100644 (file)
--- a/drivers/s390/char/sclp_con.c
+++ b/drivers/s390/char/sclp_con.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SCLP line mode console driver
  *
@@ -210,11 +211,8 @@ sclp_console_write(struct console *console, const char *message,
        /* Setup timer to output current console buffer after 1/10 second */
        if (sclp_conbuf != NULL && sclp_chars_in_buffer(sclp_conbuf) != 0 &&
            !timer_pending(&sclp_con_timer)) {
-               init_timer(&sclp_con_timer);
-               sclp_con_timer.function = sclp_console_timeout;
-               sclp_con_timer.data = 0UL;
-               sclp_con_timer.expires = jiffies + HZ/10;
-               add_timer(&sclp_con_timer);
+               setup_timer(&sclp_con_timer, sclp_console_timeout, 0UL);
+               mod_timer(&sclp_con_timer, jiffies + HZ / 10);
        }
 out:
        spin_unlock_irqrestore(&sclp_con_lock, flags);