xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

serial: 8250: Add an empty line and remove some useless {}

Browse Source 
[ Upstream commit 26f7591632d74f637f346f5d642d8ebe6b433fc9 ]

This fixes the following checkpatch.pl warnings:
   WARNING: Missing a blank line after declarations
   WARNING: braces {} are not necessary for any arm of this statement

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/257ffd691b4a062ad017333c9430d69da6dbd29a.1619594713.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 039d4926379b ("serial: 8250: Toggle IER bits on only after irq has been set up")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christophe JAILLET
2021-04-28 09:30:52 +02:00
committed by Greg Kroah-Hartman
parent 71ffe5111f
commit 3fbfa5e3cc
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/tty/serial/8250/8250_core.c
View File

@@ -332,9 +332,9 @@ static int univ8250_setup_irq(struct uart_8250_port *up)
* hardware interrupt, we use a timer-based system. The original * hardware interrupt, we use a timer-based system. The original
* driver used to do this with IRQ0. * driver used to do this with IRQ0.
*/ */
if (!port->irq) { if (!port->irq)
mod_timer(&up->timer, jiffies + uart_poll_timeout(port)); mod_timer(&up->timer, jiffies + uart_poll_timeout(port));
} else else
retval = serial_link_irq_chain(up); retval = serial_link_irq_chain(up);
return retval; return retval;
@@ -766,6 +766,7 @@ void serial8250_suspend_port(int line)
if (!console_suspend_enabled && uart_console(port) && if (!console_suspend_enabled && uart_console(port) &&
port->type != PORT_8250) { port->type != PORT_8250) {
unsigned char canary = 0xa5; unsigned char canary = 0xa5;
serial_out(up, UART_SCR, canary); serial_out(up, UART_SCR, canary);
if (serial_in(up, UART_SCR) == canary) if (serial_in(up, UART_SCR) == canary)
up->canary = canary; up->canary = canary;