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/ehv_bytechan.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/ehv_bytechan.c')
-rw-r--r-- | drivers/tty/ehv_bytechan.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c index a1c7125cb968..47ac56817c43 100644 --- a/drivers/tty/ehv_bytechan.c +++ b/drivers/tty/ehv_bytechan.c | |||
@@ -1,13 +1,10 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0 | ||
1 | /* ePAPR hypervisor byte channel device driver | 2 | /* ePAPR hypervisor byte channel device driver |
2 | * | 3 | * |
3 | * Copyright 2009-2011 Freescale Semiconductor, Inc. | 4 | * Copyright 2009-2011 Freescale Semiconductor, Inc. |
4 | * | 5 | * |
5 | * Author: Timur Tabi <timur@freescale.com> | 6 | * Author: Timur Tabi <timur@freescale.com> |
6 | * | 7 | * |
7 | * This file is licensed under the terms of the GNU General Public License | ||
8 | * version 2. This program is licensed "as is" without any warranty of any | ||
9 | * kind, whether express or implied. | ||
10 | * | ||
11 | * This driver support three distinct interfaces, all of which are related to | 8 | * This driver support three distinct interfaces, all of which are related to |
12 | * ePAPR hypervisor byte channels. | 9 | * ePAPR hypervisor byte channels. |
13 | * | 10 | * |
@@ -328,7 +325,7 @@ console_initcall(ehv_bc_console_init); | |||
328 | /******************************** TTY DRIVER ********************************/ | 325 | /******************************** TTY DRIVER ********************************/ |
329 | 326 | ||
330 | /* | 327 | /* |
331 | * byte channel receive interupt handler | 328 | * byte channel receive interrupt handler |
332 | * | 329 | * |
333 | * This ISR is called whenever data is available on a byte channel. | 330 | * This ISR is called whenever data is available on a byte channel. |
334 | */ | 331 | */ |
@@ -428,7 +425,7 @@ static void ehv_bc_tx_dequeue(struct ehv_bc_data *bc) | |||
428 | } | 425 | } |
429 | 426 | ||
430 | /* | 427 | /* |
431 | * byte channel transmit interupt handler | 428 | * byte channel transmit interrupt handler |
432 | * | 429 | * |
433 | * This ISR is called whenever space becomes available for transmitting | 430 | * This ISR is called whenever space becomes available for transmitting |
434 | * characters on a byte channel. | 431 | * characters on a byte channel. |