Commit 2765852e authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

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: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20211118071911.12059-5-jslaby@suse.czSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 954a0881
...@@ -1685,17 +1685,13 @@ static void uart_port_shutdown(struct tty_port *port) ...@@ -1685,17 +1685,13 @@ static void uart_port_shutdown(struct tty_port *port)
*/ */
wake_up_interruptible(&port->delta_msr_wait); wake_up_interruptible(&port->delta_msr_wait);
/* if (uport) {
* Free the IRQ and disable the port. /* Free the IRQ and disable the port. */
*/
if (uport)
uport->ops->shutdown(uport); uport->ops->shutdown(uport);
/* /* Ensure that the IRQ handler isn't running on another CPU. */
* Ensure that the IRQ handler isn't running on another CPU.
*/
if (uport)
synchronize_irq(uport->irq); synchronize_irq(uport->irq);
}
} }
static int uart_carrier_raised(struct tty_port *port) static int uart_carrier_raised(struct tty_port *port)
......
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