diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-14 00:05:31 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-14 00:05:31 -0500 |
commit | fb0255fb2941ef6f21742b2bc146d6b9aef4fedc (patch) | |
tree | 8334f3485152b1c887ddfe04ba9a95c8a704481c /drivers/tty/tty_port.c | |
parent | 449fcf3ab0baf3dde9952385e6789f2ca10c3980 (diff) | |
parent | 57f5d648c45c3d40a3257c06629c14fd53c383bc (diff) |
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
...
Diffstat (limited to 'drivers/tty/tty_port.c')
-rw-r--r-- | drivers/tty/tty_port.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c index 6b137194069f..25d736880013 100644 --- a/drivers/tty/tty_port.c +++ b/drivers/tty/tty_port.c | |||
@@ -1,3 +1,4 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0 | ||
1 | /* | 2 | /* |
2 | * Tty port functions | 3 | * Tty port functions |
3 | */ | 4 | */ |
@@ -78,7 +79,7 @@ EXPORT_SYMBOL(tty_port_init); | |||
78 | * @driver: tty_driver for this device | 79 | * @driver: tty_driver for this device |
79 | * @index: index of the tty | 80 | * @index: index of the tty |
80 | * | 81 | * |
81 | * Provide the tty layer wit ha link from a tty (specified by @index) to a | 82 | * Provide the tty layer with a link from a tty (specified by @index) to a |
82 | * tty_port (@port). Use this only if neither tty_port_register_device nor | 83 | * tty_port (@port). Use this only if neither tty_port_register_device nor |
83 | * tty_port_install is used in the driver. If used, this has to be called before | 84 | * tty_port_install is used in the driver. If used, this has to be called before |
84 | * tty_register_driver. | 85 | * tty_register_driver. |
@@ -235,7 +236,7 @@ EXPORT_SYMBOL(tty_port_free_xmit_buf); | |||
235 | 236 | ||
236 | /** | 237 | /** |
237 | * tty_port_destroy -- destroy inited port | 238 | * tty_port_destroy -- destroy inited port |
238 | * @port: tty port to be doestroyed | 239 | * @port: tty port to be destroyed |
239 | * | 240 | * |
240 | * When a port was initialized using tty_port_init, one has to destroy the | 241 | * When a port was initialized using tty_port_init, one has to destroy the |
241 | * port by this function. Either indirectly by using tty_port refcounting | 242 | * port by this function. Either indirectly by using tty_port refcounting |