drivers/serial: Clean up the locking for -rt

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index fb867a9f55e9..a1f403ec9213 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2729,14 +2729,10 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
 
         touch_nmi_watchdog();
 
-        local_irq_save(flags);
-        if (up->port.sysrq) {
-                /* serial8250_handle_port() already took the lock */
-                locked = 0;
-        } else if (oops_in_progress) {
-                locked = spin_trylock(&up->port.lock);
-        } else
-                spin_lock(&up->port.lock);
+        if (up->port.sysrq || oops_in_progress)
+                locked = spin_trylock_irqsave(&up->port.lock, flags);
+        else
+                spin_lock_irqsave(&up->port.lock, flags);
 
         /*
          *      First save the IER then disable the interrupts
@@ -2768,8 +2764,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
                 check_modem_status(up);
 
         if (locked)
-                spin_unlock(&up->port.lock);
-        local_irq_restore(flags);
+                spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
 static int __init serial8250_console_setup(struct console *co, char *options)