Skip to content

Commit

Permalink
[SERIAL] Move interrupt-time spinlocking inside serial8250_handle_port()
Browse files Browse the repository at this point in the history
All call sites for serial8250_handle_port() acquired the port spinlock
and released it afterwards.  This is a needless duplication of code.
Move the spinlocking inside serial8250_handle_port().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King authored and Russell King committed Jan 4, 2006
1 parent 50aec3b commit 45e2460
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/serial/8250.c
Original file line number Diff line number Diff line change
Expand Up @@ -1281,7 +1281,11 @@ static unsigned int check_modem_status(struct uart_8250_port *up)
static inline void
serial8250_handle_port(struct uart_8250_port *up, struct pt_regs *regs)
{
unsigned int status = serial_inp(up, UART_LSR);
unsigned int status;

spin_lock(&up->port.lock);

status = serial_inp(up, UART_LSR);

DEBUG_INTR("status = %x...", status);

Expand All @@ -1290,6 +1294,8 @@ serial8250_handle_port(struct uart_8250_port *up, struct pt_regs *regs)
check_modem_status(up);
if (status & UART_LSR_THRE)
transmit_chars(up);

spin_unlock(&up->port.lock);
}

/*
Expand Down Expand Up @@ -1325,9 +1331,7 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id, struct pt_regs *r

iir = serial_in(up, UART_IIR);
if (!(iir & UART_IIR_NO_INT)) {
spin_lock(&up->port.lock);
serial8250_handle_port(up, regs);
spin_unlock(&up->port.lock);

handled = 1;

Expand Down Expand Up @@ -1426,11 +1430,8 @@ static void serial8250_timeout(unsigned long data)
unsigned int iir;

iir = serial_in(up, UART_IIR);
if (!(iir & UART_IIR_NO_INT)) {
spin_lock(&up->port.lock);
if (!(iir & UART_IIR_NO_INT))
serial8250_handle_port(up, NULL);
spin_unlock(&up->port.lock);
}

timeout = up->port.timeout;
timeout = timeout > 6 ? (timeout / 2 - 2) : 1;
Expand Down

0 comments on commit 45e2460

Please sign in to comment.