diff options
| author | Felipe Balbi <balbi@ti.com> | 2012-09-06 15:45:30 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-06 09:17:01 -0700 |
| commit | 6c3a30c7fbed820f65d5e708f1e83468d8ec9921 (patch) | |
| tree | 64bab92d01b82786fbae81561bea7528ec407a2d /drivers/tty/serial/omap-serial.c | |
| parent | 7e9c8e7dbf3b9cc94947d76cb57985682517cc6e (diff) | |
| download | kernel_goldelico_gta04-6c3a30c7fbed820f65d5e708f1e83468d8ec9921.zip kernel_goldelico_gta04-6c3a30c7fbed820f65d5e708f1e83468d8ec9921.tar.gz kernel_goldelico_gta04-6c3a30c7fbed820f65d5e708f1e83468d8ec9921.tar.bz2 | |
serial: omap: don't save IRQ flags on hardirq
When we're running our hardirq handler, there's
not need to disable IRQs with spin_lock_irqsave()
because IRQs are already disabled. It also makes
no difference if we save or not IRQ flags.
Switch over to simple spin_lock/spin_unlock and
drop the "flags" variable.
Tested-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/omap-serial.c')
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 0ceca44..99042b0 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -351,11 +351,10 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id) struct tty_struct *tty = up->port.state->port.tty; unsigned int iir, lsr; unsigned int type; - unsigned long flags; irqreturn_t ret = IRQ_NONE; int max_count = 256; - spin_lock_irqsave(&up->port.lock, flags); + spin_lock(&up->port.lock); pm_runtime_get_sync(up->dev); do { @@ -394,7 +393,7 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id) } } while (!(iir & UART_IIR_NO_INT) && max_count--); - spin_unlock_irqrestore(&up->port.lock, flags); + spin_unlock(&up->port.lock); tty_flip_buffer_push(tty); |