Commit 86b21199 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Greg Kroah-Hartman

serial: manually inline serial8250_handle_port

Currently serial8250_handle_irq is a trivial wrapper around
serial8250_handle_port, which actually does all the work.

Since there are no other callers of serial8250_handle_port, we
can just move it inline into serial8250_handle_irq.  This also
makes it more clear what functionality any custom IRQ handlers
need to provide if not using serial8250_default_handle_irq.
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a0431476
...@@ -1528,10 +1528,15 @@ EXPORT_SYMBOL_GPL(serial8250_modem_status); ...@@ -1528,10 +1528,15 @@ EXPORT_SYMBOL_GPL(serial8250_modem_status);
/* /*
* This handles the interrupt from one port. * This handles the interrupt from one port.
*/ */
static void serial8250_handle_port(struct uart_8250_port *up) int serial8250_handle_irq(struct uart_port *port, unsigned int iir)
{ {
unsigned char status; unsigned char status;
unsigned long flags; unsigned long flags;
struct uart_8250_port *up =
container_of(port, struct uart_8250_port, port);
if (iir & UART_IIR_NO_INT)
return 0;
spin_lock_irqsave(&up->port.lock, flags); spin_lock_irqsave(&up->port.lock, flags);
...@@ -1546,19 +1551,7 @@ static void serial8250_handle_port(struct uart_8250_port *up) ...@@ -1546,19 +1551,7 @@ static void serial8250_handle_port(struct uart_8250_port *up)
serial8250_tx_chars(up); serial8250_tx_chars(up);
spin_unlock_irqrestore(&up->port.lock, flags); spin_unlock_irqrestore(&up->port.lock, flags);
} return 1;
int serial8250_handle_irq(struct uart_port *port, unsigned int iir)
{
struct uart_8250_port *up =
container_of(port, struct uart_8250_port, port);
if (!(iir & UART_IIR_NO_INT)) {
serial8250_handle_port(up);
return 1;
}
return 0;
} }
EXPORT_SYMBOL_GPL(serial8250_handle_irq); EXPORT_SYMBOL_GPL(serial8250_handle_irq);
...@@ -2827,7 +2820,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count) ...@@ -2827,7 +2820,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
local_irq_save(flags); local_irq_save(flags);
if (up->port.sysrq) { if (up->port.sysrq) {
/* serial8250_handle_port() already took the lock */ /* serial8250_handle_irq() already took the lock */
locked = 0; locked = 0;
} else if (oops_in_progress) { } else if (oops_in_progress) {
locked = spin_trylock(&up->port.lock); locked = spin_trylock(&up->port.lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment