From: Andy Shevchenko Date: Wed, 11 Mar 2020 09:00:27 +0000 (+0200) Subject: serial: pic32_uart: Use uart_console() helper X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cfb7bdfc69782717f83657d9d888e84961dfc5ad;p=openwrt%2Fstaging%2Fblogic.git serial: pic32_uart: Use uart_console() helper Use uart_console() helper in instead of open coded variant. Note, SERIAL_CORE_CONSOLE is selected by SERIAL_PIC32_CONSOLE, thus no functional changes expected. Signed-off-by: Andy Shevchenko Link: https://lore.kernel.org/r/20200311090027.64441-1-andriy.shevchenko@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/pic32_uart.c b/drivers/tty/serial/pic32_uart.c index 484b7e8d5381..0a12fb11e698 100644 --- a/drivers/tty/serial/pic32_uart.c +++ b/drivers/tty/serial/pic32_uart.c @@ -768,11 +768,6 @@ static int __init pic32_console_init(void) } console_initcall(pic32_console_init); -static inline bool is_pic32_console_port(struct uart_port *port) -{ - return port->cons && port->cons->index == port->line; -} - /* * Late console initialization. */ @@ -873,8 +868,7 @@ static int pic32_uart_probe(struct platform_device *pdev) } #ifdef CONFIG_SERIAL_PIC32_CONSOLE - if (is_pic32_console_port(port) && - (pic32_console.flags & CON_ENABLED)) { + if (uart_console(port) && (pic32_console.flags & CON_ENABLED)) { /* The peripheral clock has been enabled by console_setup, * so disable it till the port is used. */