Merge tag 'tty-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial updates from Greg KH:
 "Here is the big tty/serial driver pull request for 4.15-rc1.

  Lots of serial driver updates in here, some small vt cleanups, and a
  raft of SPDX and license boilerplate cleanups, messing up the diffstat
  a bit.

  Nothing major, with no realy functional changes except better hardware
  support for some platforms.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'tty-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (110 commits)
  tty: ehv_bytechan: fix spelling mistake
  tty: serial: meson: allow baud-rates lower than 9600
  serial: 8250_fintek: Fix crash with baud rate B0
  serial: 8250_fintek: Disable delays for ports != 0
  serial: 8250_fintek: Return -EINVAL on invalid configuration
  tty: Remove redundant license text
  tty: serdev: Remove redundant license text
  tty: hvc: Remove redundant license text
  tty: serial: Remove redundant license text
  tty: add SPDX identifiers to all remaining files in drivers/tty/
  tty: serial: jsm: remove redundant pointer ts
  tty: serial: jsm: add space before the open parenthesis '('
  tty: serial: jsm: fix coding style
  tty: serial: jsm: delete space between function name and '('
  tty: serial: jsm: add blank line after declarations
  tty: serial: jsm: change the type of local variable
  tty: serial: imx: remove dead code imx_dma_rxint
  tty: serial: imx: disable ageing timer interrupt if dma in use
  serial: 8250: fix potential deadlock in rs485-mode
  serial: m32r_sio: Drop redundant .data assignment
  ...

1 files changed, 8 insertions, 14 deletions

diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 7dd38047ba23..8bc15cb67a58 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *          mxser.c  -- MOXA Smartio/Industio family multiport serial driver.
  *
@@ -8,11 +9,6 @@
  *      Linux serial driver, written by Linus Torvalds, Theodore T'so and
  *      others.
  *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
  *      Fed through a cleanup, indent and remove of non 2.6 code by Alan Cox
  *      <alan@lxorguk.ukuu.org.uk>. The original 1.8 code is available on
  *      www.moxa.com.
@@ -642,8 +638,7 @@ static int mxser_set_baud(struct tty_struct *tty, long newspd)
  * This routine is called to set the UART divisor registers to match
  * the specified baud rate for a serial port.
  */
-static int mxser_change_speed(struct tty_struct *tty,
-                                        struct ktermios *old_termios)
+static int mxser_change_speed(struct tty_struct *tty)
 {
         struct mxser_port *info = tty->driver_data;
         unsigned cflag, cval, fcr;
@@ -945,7 +940,7 @@ static int mxser_activate(struct tty_port *port, struct tty_struct *tty)
         /*
          * and set the speed of the serial port
          */
-        mxser_change_speed(tty, NULL);
+        mxser_change_speed(tty);
         spin_unlock_irqrestore(&info->slock, flags);
 
         return 0;
@@ -1288,7 +1283,7 @@ static int mxser_set_serial_info(struct tty_struct *tty,
         if (tty_port_initialized(port)) {
                 if (flags != (port->flags & ASYNC_SPD_MASK)) {
                         spin_lock_irqsave(&info->slock, sl_flags);
-                        mxser_change_speed(tty, NULL);
+                        mxser_change_speed(tty);
                         spin_unlock_irqrestore(&info->slock, sl_flags);
                 }
         } else {
@@ -1946,7 +1941,7 @@ static void mxser_set_termios(struct tty_struct *tty, struct ktermios *old_termi
         unsigned long flags;
 
         spin_lock_irqsave(&info->slock, flags);
-        mxser_change_speed(tty, old_termios);
+        mxser_change_speed(tty);
         spin_unlock_irqrestore(&info->slock, flags);
 
         if ((old_termios->c_cflag & CRTSCTS) && !C_CRTSCTS(tty)) {
@@ -2375,8 +2370,7 @@ static void mxser_release_ISA_res(struct mxser_board *brd)
         mxser_release_vector(brd);
 }
 
-static int mxser_initbrd(struct mxser_board *brd,
-                struct pci_dev *pdev)
+static int mxser_initbrd(struct mxser_board *brd)
 {
         struct mxser_port *info;
         unsigned int i;
@@ -2640,7 +2634,7 @@ static int mxser_probe(struct pci_dev *pdev,
         }
 
         /* mxser_initbrd will hook ISR. */
-        retval = mxser_initbrd(brd, pdev);
+        retval = mxser_initbrd(brd);
         if (retval)
                 goto err_rel3;
 
@@ -2746,7 +2740,7 @@ static int __init mxser_module_init(void)
                                 brd->info->name, ioaddr[b]);
 
                 /* mxser_initbrd will hook ISR. */
-                if (mxser_initbrd(brd, NULL) < 0) {
+                if (mxser_initbrd(brd) < 0) {
                         mxser_release_ISA_res(brd);
                         brd->info = NULL;
                         continue;