Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <2612fae5-e972-5c82-c44e-af1fb1d839fd@kernel.org>
Date:   Tue, 17 May 2022 11:12:34 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.0
Subject: Re: [PATCH -next] serial: cpm_uart: Fix build error without
 CONFIG_SERIAL_CPM_CONSOLE
Content-Language: en-US
To:     YueHaibing <yuehaibing@huawei.com>, gregkh@linuxfoundation.org,
        geert@linux-m68k.org
Cc:     linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20220517081355.35456-1-yuehaibing@huawei.com>
From:   Jiri Slaby <jirislaby@kernel.org>
In-Reply-To: <20220517081355.35456-1-yuehaibing@huawei.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

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