bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-05 23:05:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

serial: 8250: invert conditions in RSA functions

Browse Source 
The code can short-return in case something does not hold. So invert the
conditions and return in those cases immediately. This makes the code
flow more natural and less nested.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20250611100319.186924-11-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby (SUSE)
2025-06-11 12:02:56 +02:00
committed by Greg Kroah-Hartman
parent 33d9ca5daa
commit a1efa7f624
1 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
drivers/tty/serial/8250/8250_port.c
View File

@@ -743,15 +743,16 @@ static int __enable_rsa(struct uart_8250_port *up)
*/
static void enable_rsa(struct uart_8250_port *up)
{
if (up->port.type == PORT_RSA) {
if (up->port.uartclk != SERIAL_RSA_BAUD_BASE * 16) {
uart_port_lock_irq(&up->port);
__enable_rsa(up);
uart_port_unlock_irq(&up->port);
}
if (up->port.uartclk == SERIAL_RSA_BAUD_BASE * 16)
serial_out(up, UART_RSA_FRR, 0);
if (up->port.type != PORT_RSA)
return;
if (up->port.uartclk != SERIAL_RSA_BAUD_BASE * 16) {
uart_port_lock_irq(&up->port);
__enable_rsa(up);
uart_port_unlock_irq(&up->port);
}
if (up->port.uartclk == SERIAL_RSA_BAUD_BASE * 16)
serial_out(up, UART_RSA_FRR, 0);
}
/*
@@ -764,37 +765,45 @@ static void disable_rsa(struct uart_8250_port *up)
unsigned char mode;
int result;
if (up->port.type == PORT_RSA &&
up->port.uartclk == SERIAL_RSA_BAUD_BASE * 16) {
uart_port_lock_irq(&up->port);
if (up->port.type != PORT_RSA)
return;
if (up->port.uartclk != SERIAL_RSA_BAUD_BASE * 16)
return;
uart_port_lock_irq(&up->port);
mode = serial_in(up, UART_RSA_MSR);
result = !(mode & UART_RSA_MSR_FIFO);
if (!result) {
serial_out(up, UART_RSA_MSR, mode & ~UART_RSA_MSR_FIFO);
mode = serial_in(up, UART_RSA_MSR);
result = !(mode & UART_RSA_MSR_FIFO);
if (!result) {
serial_out(up, UART_RSA_MSR, mode & ~UART_RSA_MSR_FIFO);
mode = serial_in(up, UART_RSA_MSR);
result = !(mode & UART_RSA_MSR_FIFO);
}
if (result)
up->port.uartclk = SERIAL_RSA_BAUD_BASE_LO * 16;
uart_port_unlock_irq(&up->port);
}
if (result)
up->port.uartclk = SERIAL_RSA_BAUD_BASE_LO * 16;
uart_port_unlock_irq(&up->port);
}
static void rsa_autoconfig(struct uart_8250_port *up)
{
/* Only probe for RSA ports if we got the region. */
if (up->port.type == PORT_16550A && up->probe & UART_PROBE_RSA &&
__enable_rsa(up))
if (up->port.type != PORT_16550A)
return;
if (!(up->probe & UART_PROBE_RSA))
return;
if (__enable_rsa(up))
up->port.type = PORT_RSA;
}
static void rsa_reset(struct uart_8250_port *up)
{
if (up->port.type == PORT_RSA)
serial_out(up, UART_RSA_FRR, 0);
if (up->port.type != PORT_RSA)
return;
serial_out(up, UART_RSA_FRR, 0);
}
#else
static inline void enable_rsa(struct uart_8250_port *up) {}