lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 659/849] serial: cpm_uart: Protect udbg definitions by CONFIG_SERIAL_CPM_CONSOLE
    Date
    From: Geert Uytterhoeven <geert@linux-m68k.org>

    [ Upstream commit d142585bceb3218ad432ed0fcd5be9d6e3cd9052 ]

    If CONFIG_CONSOLE_POLL=y, and CONFIG_SERIAL_CPM=m (hence
    CONFIG_SERIAL_CPM_CONSOLE=n):

    drivers/tty/serial/cpm_uart/cpm_uart_core.c:1109:12: warning: ‘udbg_cpm_getc’ defined but not used [-Wunused-function]
    1109 | static int udbg_cpm_getc(void)
    | ^~~~~~~~~~~~~
    drivers/tty/serial/cpm_uart/cpm_uart_core.c:1095:13: warning: ‘udbg_cpm_putc’ defined but not used [-Wunused-function]
    1095 | static void udbg_cpm_putc(char c)
    | ^~~~~~~~~~~~~

    Fix this by making the udbg definitions depend on
    CONFIG_SERIAL_CPM_CONSOLE, in addition to CONFIG_CONSOLE_POLL.

    Fixes: a60526097f42eb98 ("tty: serial: cpm_uart: Add udbg support for enabling xmon")
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Link: https://lore.kernel.org/r/20211027075326.3270785-1-geert@linux-m68k.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 c719aa2b18328..d6d3db9c3b1f8 100644
    --- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
    +++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
    @@ -1090,6 +1090,7 @@ static void cpm_put_poll_char(struct uart_port *port,
    cpm_uart_early_write(pinfo, ch, 1, false);
    }

    +#ifdef CONFIG_SERIAL_CPM_CONSOLE
    static struct uart_port *udbg_port;

    static void udbg_cpm_putc(char c)
    @@ -1114,6 +1115,7 @@ static int udbg_cpm_getc(void)
    cpu_relax();
    return c;
    }
    +#endif /* CONFIG_SERIAL_CPM_CONSOLE */

    #endif /* CONFIG_CONSOLE_POLL */

    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:14    [W:3.721 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site