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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Dmitry Safonov <0x7f454c46@gmail.com> Link: https://lore.kernel.org/r/20200310174337.74109-4-andriy.shevchenko@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
这个提交包含在:
@@ -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;
|
||||
port->sysrq_ch = 0;
|
||||
spin_unlock_irqrestore(&port->lock, flags);
|
||||
if (sysrq_ch)
|
||||
handle_sysrq(sysrq_ch);
|
||||
} else {
|
||||
spin_unlock_irqrestore(&port->lock, flags);
|
||||
}
|
||||
|
||||
sysrq_ch = port->sysrq_ch;
|
||||
port->sysrq_ch = 0;
|
||||
|
||||
spin_unlock_irqrestore(&port->lock, irqflags);
|
||||
|
||||
if (sysrq_ch)
|
||||
handle_sysrq(sysrq_ch);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(uart_unlock_and_check_sysrq);
|
||||
|
||||
|
在新工单中引用
屏蔽一个用户