[PATCH tty-next] serial:sunplus-uart:Fix compile error while CONFIG_SERIAL_SUNPLUS_CONSOLE=n

[PATCH tty-next] serial:sunplus-uart:Fix compile error while CONFIG_SERIAL_SUNPLUS_CONSOLE=n

[Hammer Hsieh]

1. Fix implicit declaration of function 'wait_for_xmitr' issue.
2. Fix 'sunplus_uart_console' undeclared here issue.
3. Fix use of undeclared identifier 'sunplus_uart_console' issue.

Fixes: 9e8d547032("serial:sunplus-uart:Fix compile error for SP7021")

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Hammer Hsieh <hammerh0314@gmail.com>
---
 drivers/tty/serial/sunplus-uart.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/serial/sunplus-uart.c b/drivers/tty/serial/sunplus-uart.c
index 450c8e7..1c7a30b 100644
--- a/drivers/tty/serial/sunplus-uart.c
+++ b/drivers/tty/serial/sunplus-uart.c
@@ -441,7 +441,7 @@ static int sunplus_verify_port(struct uart_port *port, struct serial_struct *ser
 	return 0;
 }
 
-#ifdef CONFIG_SERIAL_SUNPLUS_CONSOLE
+#if defined(CONFIG_SERIAL_SUNPLUS_CONSOLE) || defined(CONFIG_CONSOLE_POLL)
 static void wait_for_xmitr(struct uart_port *port)
 {
 	unsigned int val;
@@ -562,6 +562,10 @@ static struct console sunplus_uart_console = {
 	.index		= -1,
 	.data		= &sunplus_uart_driver
 };
+
+#define	SERIAL_SUNPLUS_CONSOLE	(&sunplus_uart_console)
+#else
+#define	SERIAL_SUNPLUS_CONSOLE	NULL
 #endif
 
 static struct uart_driver sunplus_uart_driver = {
@@ -571,7 +575,7 @@ static struct uart_driver sunplus_uart_driver = {
 	.major		= TTY_MAJOR,
 	.minor		= 64,
 	.nr		= SUP_UART_NR,
-	.cons		= &sunplus_uart_console,
+	.cons		= SERIAL_SUNPLUS_CONSOLE,
 };
 
 static void sunplus_uart_disable_unprepare(void *data)
-- 
2.7.4

Re: [PATCH tty-next] serial:sunplus-uart:Fix compile error while CONFIG_SERIAL_SUNPLUS_CONSOLE=n

[Randy Dunlap]

On 2/28/22 20:19, Hammer Hsieh wrote:
> 1. Fix implicit declaration of function 'wait_for_xmitr' issue.
> 2. Fix 'sunplus_uart_console' undeclared here issue.
> 3. Fix use of undeclared identifier 'sunplus_uart_console' issue.
> 
> Fixes: 9e8d547032("serial:sunplus-uart:Fix compile error for SP7021")
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>

Tested-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>

thanks.

> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Hammer Hsieh <hammerh0314@gmail.com>
> ---
>  drivers/tty/serial/sunplus-uart.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/tty/serial/sunplus-uart.c b/drivers/tty/serial/sunplus-uart.c
> index 450c8e7..1c7a30b 100644
> --- a/drivers/tty/serial/sunplus-uart.c
> +++ b/drivers/tty/serial/sunplus-uart.c
> @@ -441,7 +441,7 @@ static int sunplus_verify_port(struct uart_port *port, struct serial_struct *ser
>  	return 0;
>  }
>  
> -#ifdef CONFIG_SERIAL_SUNPLUS_CONSOLE
> +#if defined(CONFIG_SERIAL_SUNPLUS_CONSOLE) || defined(CONFIG_CONSOLE_POLL)
>  static void wait_for_xmitr(struct uart_port *port)
>  {
>  	unsigned int val;
> @@ -562,6 +562,10 @@ static struct console sunplus_uart_console = {
>  	.index		= -1,
>  	.data		= &sunplus_uart_driver
>  };
> +
> +#define	SERIAL_SUNPLUS_CONSOLE	(&sunplus_uart_console)
> +#else
> +#define	SERIAL_SUNPLUS_CONSOLE	NULL
>  #endif
>  
>  static struct uart_driver sunplus_uart_driver = {
> @@ -571,7 +575,7 @@ static struct uart_driver sunplus_uart_driver = {
>  	.major		= TTY_MAJOR,
>  	.minor		= 64,
>  	.nr		= SUP_UART_NR,
> -	.cons		= &sunplus_uart_console,
> +	.cons		= SERIAL_SUNPLUS_CONSOLE,
>  };
>  
>  static void sunplus_uart_disable_unprepare(void *data)

-- 
~Randy