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, 6 insertions, 19 deletions

diff --git a/drivers/tty/vcc.c b/drivers/tty/vcc.c
index ef01d24858cd..58b454c34560 100644
--- a/drivers/tty/vcc.c
+++ b/drivers/tty/vcc.c
@@ -361,17 +361,13 @@ done:
         return rv;
 }
 
-static void vcc_rx_timer(unsigned long index)
+static void vcc_rx_timer(struct timer_list *t)
 {
+        struct vcc_port *port = from_timer(port, t, rx_timer);
         struct vio_driver_state *vio;
-        struct vcc_port *port;
         unsigned long flags;
         int rv;
 
-        port = vcc_get_ne(index);
-        if (!port)
-                return;
-
         spin_lock_irqsave(&port->lock, flags);
         port->rx_timer.expires = 0;
 
@@ -391,18 +387,14 @@ done:
         vcc_put(port, false);
 }
 
-static void vcc_tx_timer(unsigned long index)
+static void vcc_tx_timer(struct timer_list *t)
 {
-        struct vcc_port *port;
+        struct vcc_port *port = from_timer(port, t, tx_timer);
         struct vio_vcc *pkt;
         unsigned long flags;
         int tosend = 0;
         int rv;
 
-        port = vcc_get_ne(index);
-        if (!port)
-                return;
-
         spin_lock_irqsave(&port->lock, flags);
         port->tx_timer.expires = 0;
 
@@ -645,13 +637,8 @@ static int vcc_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         if (rv)
                 goto free_domain;
 
-        init_timer(&port->rx_timer);
-        port->rx_timer.function = vcc_rx_timer;
-        port->rx_timer.data = port->index;
-
-        init_timer(&port->tx_timer);
-        port->tx_timer.function = vcc_tx_timer;
-        port->tx_timer.data = port->index;
+        timer_setup(&port->rx_timer, vcc_rx_timer, 0);
+        timer_setup(&port->tx_timer, vcc_tx_timer, 0);
 
         dev_set_drvdata(&vdev->dev, port);