Commit da9a5aa3 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

serial: core: Refactor uart_unlock_and_check_sysrq() 



Refactor uart_unlock_and_check_sysrq() to:

  - explicitly show that we release a port lock which makes
    static analyzers happy:

CHECK   drivers/tty/serial/serial_core.c
.../serial_core.c:3290:17: warning: context imbalance in 'uart_unlock_and_check_sysrq' - unexpected unlock

  - use flags instead of irqflags to avoid confusion with IRQ flags

  - provide one return point

  - be more compact

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarDmitry Safonov <0x7f454c46@gmail.com>
Link: https://lore.kernel.org/r/20200310174337.74109-4-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e140ef36

drivers/tty/serial/serial_core.c

+10 −13
Original line number Diff line number Diff line
@@ -3187,22 +3187,19 @@ int uart_prepare_sysrq_char(struct uart_port *port, unsigned int ch) 
}

EXPORT_SYMBOL_GPL(uart_prepare_sysrq_char);



void uart_unlock_and_check_sysrq(struct uart_port *port, unsigned long irqflags)

void uart_unlock_and_check_sysrq(struct uart_port *port, unsigned long flags)

__releases(&port->lock)

{

	int sysrq_ch;

	if (port->has_sysrq) {

		int sysrq_ch = port->sysrq_ch;



	if (!port->has_sysrq) {

		spin_unlock_irqrestore(&port->lock, irqflags);

		return;

	}



	sysrq_ch = port->sysrq_ch;

		port->sysrq_ch = 0;



	spin_unlock_irqrestore(&port->lock, irqflags);



		spin_unlock_irqrestore(&port->lock, flags);

		if (sysrq_ch)

			handle_sysrq(sysrq_ch);

	} else {

		spin_unlock_irqrestore(&port->lock, flags);

	}

}

EXPORT_SYMBOL_GPL(uart_unlock_and_check_sysrq);

include/linux/serial_core.h

+1 −2
Original line number Diff line number Diff line
@@ -462,8 +462,7 @@ extern void uart_insert_char(struct uart_port *port, unsigned int status, 


extern int uart_handle_sysrq_char(struct uart_port *port, unsigned int ch);

extern int uart_prepare_sysrq_char(struct uart_port *port, unsigned int ch);

extern void uart_unlock_and_check_sysrq(struct uart_port *port,

					unsigned long irqflags);

extern void uart_unlock_and_check_sysrq(struct uart_port *port, unsigned long flags);

extern int uart_handle_break(struct uart_port *port);



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE