Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fa4accf authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

serial: meson: hide an unused function 



The newly added meson_uart_enable_tx_engine function is only called
from the console setup, not the runtime uart, which has an open-coded
version of the same register access. This produces a harmless warning
when the console code is disabled:

drivers/tty/serial/meson_uart.c:127:13: error: 'meson_uart_enable_tx_engine' defined but not used [-Werror=unused-function]

Let's move the function inside of the #ifdef to avoid the warning.

Fixes: ba50f1df ("serial: meson: remove unneeded variable assignment in meson_serial_port_write")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d653c43a

drivers/tty/serial/meson_uart.c

+8 −9
Original line number Diff line number Diff line
@@ -124,15 +124,6 @@ static void meson_uart_stop_rx(struct uart_port *port) 
	writel(val, port->membase + AML_UART_CONTROL);

}



static void meson_uart_enable_tx_engine(struct uart_port *port)

{

	u32 val;



	val = readl(port->membase + AML_UART_CONTROL);

	val |= AML_UART_TX_EN;

	writel(val, port->membase + AML_UART_CONTROL);

}



static void meson_uart_shutdown(struct uart_port *port)

{

	unsigned long flags;
@@ -451,6 +442,14 @@ static struct uart_ops meson_uart_ops = { 
};



#ifdef CONFIG_SERIAL_MESON_CONSOLE

static void meson_uart_enable_tx_engine(struct uart_port *port)

{

	u32 val;



	val = readl(port->membase + AML_UART_CONTROL);

	val |= AML_UART_TX_EN;

	writel(val, port->membase + AML_UART_CONTROL);

}



static void meson_console_putchar(struct uart_port *port, int ch)

{