Commit b164c972 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

serial: core: Simplify console suspend logic in uart_suspend_port() 



When the uart port being suspended is a console and consoles are
not suspending (kernel command line contains no_console_suspend),
then no action is performed for that port, and the function can
return early.

If the function has not returned early, then one of the conditions
is not true, so the expression
   (console_suspend_enabled || !uart_console(uport))
must be true and can be eliminated.

Similarly, the expression
   (console_suspend_enabled && uart_console(uport))
simplifies to just uart_console(uport).

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ea9e9d80

drivers/tty/serial/serial_core.c

+17 −18
Original line number Diff line number Diff line
@@ -2008,14 +2008,16 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport) 
	}

	put_device(tty_dev);



	if (console_suspend_enabled || !uart_console(uport))

	/* Nothing to do if the console is not suspending */

	if (!console_suspend_enabled && uart_console(uport))

		goto unlock;



	uport->suspended = 1;



	if (port->flags & ASYNC_INITIALIZED) {

		const struct uart_ops *ops = uport->ops;

		int tries;



		if (console_suspend_enabled || !uart_console(uport)) {

		set_bit(ASYNCB_SUSPENDED, &port->flags);

		clear_bit(ASYNCB_INITIALIZED, &port->flags);
@@ -2024,7 +2026,6 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport) 
		ops->set_mctrl(uport, 0);

		ops->stop_rx(uport);

		spin_unlock_irq(&uport->lock);

		}



		/*

		 * Wait for the transmitter to empty.
@@ -2036,19 +2037,17 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport) 
				drv->dev_name,

				drv->tty_driver->name_base + uport->line);



		if (console_suspend_enabled || !uart_console(uport))

		ops->shutdown(uport);

	}



	/*

	 * Disable the console device before suspending.

	 */

	if (console_suspend_enabled && uart_console(uport))

	if (uart_console(uport))

		console_stop(uport->cons);



	if (console_suspend_enabled || !uart_console(uport))

	uart_change_pm(state, UART_PM_STATE_OFF);



unlock:

	mutex_unlock(&port->mutex);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE