tty: serial, join uport checks in uart_port_shutdown()

There are two consequent checks of uport != NULL in
uart_port_shutdown(). Join these two under a single block.

De-multiline the comments when shuffling with them anyway.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20211118071911.12059-5-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 1e738f2..a875092 100644 (file)
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -1685,17 +1685,13 @@ static void uart_port_shutdown(struct tty_port *port)
         */
        wake_up_interruptible(&port->delta_msr_wait);
 
-       /*
-        * Free the IRQ and disable the port.
-        */
-       if (uport)
+       if (uport) {
+               /* Free the IRQ and disable the port. */
                uport->ops->shutdown(uport);
 
-       /*
-        * Ensure that the IRQ handler isn't running on another CPU.
-        */
-       if (uport)
+               /* Ensure that the IRQ handler isn't running on another CPU. */
                synchronize_irq(uport->irq);
+       }
 }
 
 static int uart_carrier_raised(struct tty_port *port)