tty/serial: atmel: Use uart_console() helper (207f6f34) · Commits · 戴 / test

drivers/tty/serial/atmel_serial.c

+5 −15

Original line number	Diff line number	Diff line
		@@ -2676,18 +2676,8 @@ static struct console atmel_console = {

		#define ATMEL_CONSOLE_DEVICE (&atmel_console)

		static inline bool atmel_is_console_port(struct uart_port *port)
		{
		return port->cons && port->cons->index == port->line;
		}

		#else
		#define ATMEL_CONSOLE_DEVICE NULL

		static inline bool atmel_is_console_port(struct uart_port *port)
		{
		return false;
		}
		#endif

		static struct uart_driver atmel_uart = {
		@@ -2716,14 +2706,14 @@ static int atmel_serial_suspend(struct platform_device *pdev,
		struct uart_port *port = platform_get_drvdata(pdev);
		struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);

		if (atmel_is_console_port(port) && console_suspend_enabled) {
		if (uart_console(port) && console_suspend_enabled) {
		/* Drain the TX shifter */
		while (!(atmel_uart_readl(port, ATMEL_US_CSR) &
		ATMEL_US_TXEMPTY))
		cpu_relax();
		}

		if (atmel_is_console_port(port) && !console_suspend_enabled) {
		if (uart_console(port) && !console_suspend_enabled) {
		/* Cache register values as we won't get a full shutdown/startup
		* cycle
		*/
		@@ -2759,7 +2749,7 @@ static int atmel_serial_resume(struct platform_device *pdev)
		struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
		unsigned long flags;

		if (atmel_is_console_port(port) && !console_suspend_enabled) {
		if (uart_console(port) && !console_suspend_enabled) {
		atmel_uart_writel(port, ATMEL_US_MR, atmel_port->cache.mr);
		atmel_uart_writel(port, ATMEL_US_IER, atmel_port->cache.imr);
		atmel_uart_writel(port, ATMEL_US_BRGR, atmel_port->cache.brgr);
		@@ -2913,7 +2903,7 @@ static int atmel_serial_probe(struct platform_device *pdev)
		goto err_add_port;

		#ifdef CONFIG_SERIAL_ATMEL_CONSOLE
		if (atmel_is_console_port(&atmel_port->uart)
		if (uart_console(&atmel_port->uart)
		&& ATMEL_CONSOLE_DEVICE->flags & CON_ENABLED) {
		/*
		* The serial core enabled the clock for us, so undo
		@@ -2956,7 +2946,7 @@ err_add_port:
		kfree(atmel_port->rx_ring.buf);
		atmel_port->rx_ring.buf = NULL;
		err_alloc_ring:
		if (!atmel_is_console_port(&atmel_port->uart)) {
		if (!uart_console(&atmel_port->uart)) {
		clk_put(atmel_port->clk);
		atmel_port->clk = NULL;
		}

Admin message