From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Nov 2017 05:05:31 +0000 (-0800)
Subject: Merge tag 'tty-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: v4.19~2225
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb0255fb2941ef6f21742b2bc146d6b9aef4fedc;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'tty-4.15-rc1' of git://git./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
  ...
---

fb0255fb2941ef6f21742b2bc146d6b9aef4fedc
diff --cc drivers/tty/cyclades.c
index dac8a1a,4f69f10..5d44246
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@@ -283,11 -284,10 +284,10 @@@ static void cyz_poll(unsigned long)
  /* The Cyclades-Z polling cycle is defined by this variable */
  static long cyz_polling_cycle = CZ_DEF_POLL;
  
 -static DEFINE_TIMER(cyz_timerlist, cyz_poll, 0, 0);
 +static DEFINE_TIMER(cyz_timerlist, cyz_poll);
  
  #else				/* CONFIG_CYZ_INTR */
- static void cyz_rx_restart(unsigned long);
- static struct timer_list cyz_rx_full_timer[NR_PORTS];
+ static void cyz_rx_restart(struct timer_list *);
  #endif				/* CONFIG_CYZ_INTR */
  
  static void cyy_writeb(struct cyclades_port *port, u32 reg, u8 val)