[v1] serial: cpm_uart: Fix build error without CONFIG_SERIAL_CPM_CONSOLE

[PATCH -next] serial: cpm_uart: Fix build error without CONFIG_SERIAL_CPM_CONSOLE

Posted by YueHaibing 3 years, 11 months ago

drivers/tty/serial/cpm_uart/cpm_uart_core.c: In function ‘cpm_uart_init_port’:
drivers/tty/serial/cpm_uart/cpm_uart_core.c:1251:7: error: ‘udbg_port’ undeclared (first use in this function); did you mean ‘uart_port’?
  if (!udbg_port)
       ^~~~~~~~~
       uart_port

commit d142585bceb3 leave this corner, wrap it with #ifdef block

Fixes: d142585bceb3 ("serial: cpm_uart: Protect udbg definitions by CONFIG_SERIAL_CPM_CONSOLE")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 drivers/tty/serial/cpm_uart/cpm_uart_core.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index d6d3db9c3b1f..ec3a8f768555 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
@@ -1248,7 +1248,9 @@ static int cpm_uart_init_port(struct device_node *np,
 
 #ifdef CONFIG_PPC_EARLY_DEBUG_CPM
 #ifdef CONFIG_CONSOLE_POLL
+#ifdef CONFIG_SERIAL_CPM_CONSOLE
 	if (!udbg_port)
+#endif
 #endif
 		udbg_putc = NULL;
 #endif
-- 
2.17.1

Re: [PATCH -next] serial: cpm_uart: Fix build error without CONFIG_SERIAL_CPM_CONSOLE

Posted by Jiri Slaby 3 years, 11 months ago

On 17. 05. 22, 10:13, YueHaibing wrote:
> drivers/tty/serial/cpm_uart/cpm_uart_core.c: In function ‘cpm_uart_init_port’:
> drivers/tty/serial/cpm_uart/cpm_uart_core.c:1251:7: error: ‘udbg_port’ undeclared (first use in this function); did you mean ‘uart_port’?
>    if (!udbg_port)
>         ^~~~~~~~~
>         uart_port
> 
> commit d142585bceb3 leave this corner, wrap it with #ifdef block
> 
> Fixes: d142585bceb3 ("serial: cpm_uart: Protect udbg definitions by CONFIG_SERIAL_CPM_CONSOLE")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
>   drivers/tty/serial/cpm_uart/cpm_uart_core.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
> index d6d3db9c3b1f..ec3a8f768555 100644
> --- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
> +++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
> @@ -1248,7 +1248,9 @@ static int cpm_uart_init_port(struct device_node *np,
>   
>   #ifdef CONFIG_PPC_EARLY_DEBUG_CPM
>   #ifdef CONFIG_CONSOLE_POLL
> +#ifdef CONFIG_SERIAL_CPM_CONSOLE
>   	if (!udbg_port)
> +#endif
>   #endif

That's ugly, could you merge the two to
   #if defined(ONE) && defined(TWO)
instead
?

>   		udbg_putc = NULL;
>   #endif


-- 
js
suse labs

Re: [PATCH -next] serial: cpm_uart: Fix build error without CONFIG_SERIAL_CPM_CONSOLE

Posted by YueHaibing 3 years, 11 months ago

On 2022/5/17 17:12, Jiri Slaby wrote:
> On 17. 05. 22, 10:13, YueHaibing wrote:
>> drivers/tty/serial/cpm_uart/cpm_uart_core.c: In function ‘cpm_uart_init_port’:
>> drivers/tty/serial/cpm_uart/cpm_uart_core.c:1251:7: error: ‘udbg_port’ undeclared (first use in this function); did you mean ‘uart_port’?
>>    if (!udbg_port)
>>         ^~~~~~~~~
>>         uart_port
>>
>> commit d142585bceb3 leave this corner, wrap it with #ifdef block
>>
>> Fixes: d142585bceb3 ("serial: cpm_uart: Protect udbg definitions by CONFIG_SERIAL_CPM_CONSOLE")
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>> ---
>>   drivers/tty/serial/cpm_uart/cpm_uart_core.c | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
>> index d6d3db9c3b1f..ec3a8f768555 100644
>> --- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
>> +++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
>> @@ -1248,7 +1248,9 @@ static int cpm_uart_init_port(struct device_node *np,
>>     #ifdef CONFIG_PPC_EARLY_DEBUG_CPM
>>   #ifdef CONFIG_CONSOLE_POLL
>> +#ifdef CONFIG_SERIAL_CPM_CONSOLE
>>       if (!udbg_port)
>> +#endif
>>   #endif
> 
> That's ugly, could you merge the two to
>   #if defined(ONE) && defined(TWO)

Ok, will do this in v2.
> instead
> ?
> 
>>           udbg_putc = NULL;
>>   #endif
> 
>