1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/tty/serial/pnx8xxx_uart.c b/drivers/tty/serial/pnx8xxx_uart.c
index dab2668d3879..f8812389b8a8 100644
--- a/drivers/tty/serial/pnx8xxx_uart.c
+++ b/drivers/tty/serial/pnx8xxx_uart.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * UART driver for PNX8XXX SoCs
  *
@@ -7,11 +8,6 @@
  *
  * Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
  * Copyright (C) 2000 Deep Blue Solutions Ltd.
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of
- * any kind, whether express or implied.
- *
  */
 
 #if defined(CONFIG_SERIAL_PNX8XXX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
@@ -666,9 +662,8 @@ static void __init pnx8xxx_init_ports(void)
         first = 0;
 
         for (i = 0; i < NR_PORTS; i++) {
-                init_timer(&pnx8xxx_ports[i].timer);
-                pnx8xxx_ports[i].timer.function = pnx8xxx_timeout;
-                pnx8xxx_ports[i].timer.data     = (unsigned long)&pnx8xxx_ports[i];
+                setup_timer(&pnx8xxx_ports[i].timer, pnx8xxx_timeout,
+                            (unsigned long)&pnx8xxx_ports[i]);
                 pnx8xxx_ports[i].port.ops = &pnx8xxx_pops;
         }
 }