From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759704AbdEVNjR (ORCPT ); Mon, 22 May 2017 09:39:17 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:53877 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756438AbdEVNjO (ORCPT ); Mon, 22 May 2017 09:39:14 -0400 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Arnd Bergmann , Jiri Slaby , Carlo Caione , Kevin Hilman , Heiner Kallweit , Martin Blumenstingl , linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] serial: meson: hide an unused function Date: Mon, 22 May 2017 15:37:03 +0200 Message-Id: <20170522133746.880230-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:dxXKndoXoZ6I0IoRefa2SjoHl3ZziIT1m2sG9Utq0c/uIkUr0OH sOHG07enO99qJWnTT/cWnpsdUXtVaxW7vvb4hsZdTd9byPhYx0vrQAqUZzxlHaJJ968c39i 0GhG6l9QnCt9DCVbSk/aIOO9k/iirOGXUKy4arFgSgTq8d9cMhl4qdU3Uxqjef0RVpX7pi7 z0JmYA5NyVJQ+08oUkF8g== X-UI-Out-Filterresults: notjunk:1;V01:K0:YPYvyV4jTQo=:vCWgWVPLuh4nyWXAb5dlba JsJdm5K0r/Dv649Vn4huQzakfCmF6z7aFe49iz6rZFnjD0VV7D7ng4FMMNsnqy954FXwZ+xvy WlcfN8TARReiIoJn0BPwV4VisS95c94VLeFbj0viCtLxrkc5Qdb/JdH7z4jCRLR2rC3tZtjzb RAhw6fakbg+3GfCLcJ3zQgyciZjO7mrTAiHFDe2HX9QLHzP1B7fV6TM9B0uXeyjqI2O4p/pUA gU7k61x1eCL7PHaj7qsE70FaBzxn+sQdcteTgEpYSXL5SUNh4QTa4jBfGfOWU2jZfNvF5d9A9 eUGP8GgKGKYuTLPDFcLyZgSfo1EO9ZCpIRo3FBtp5s/5xmutpbB6cnl5fcczwmY5CZkvzd5IW ci1WKFCaYUNaTKF+7zWs37asLakwUMPzNlnlU9rwfQzQLW4Ylunvdpv2BudORDhGS+cbxQD/Q tR7zKTND/m8oGGGzVitt8dYAcgPcfhanRcnC/W21MlQtuaW/lRCGhHyJkQQB29Uo9aqf99+tm 5HpHsR7sEawrPiVkfmoTl9qLn+9Ly6iOu5bMJGD03NvH66+638LWPHnF/Yg9I5pRdjf9X8YAF ymu9ewEh/FD41C5bv0iTqptsYSAQEUEwa2DrCGc4NgcN1qr9EO33Z3KsuCvPdUr/cBno54tlo M7skkjEo0wZ3VZo0EKfXTguHKJdCZ9aFY1s1LnlRzTIjbWFIRxPmQeh1G6Mc9s5PhjAE= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: ba50f1df13c8 ("serial: meson: remove unneeded variable assignment in meson_serial_port_write") Signed-off-by: Arnd Bergmann --- drivers/tty/serial/meson_uart.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c index 082e038e67f8..c0e34dabadd8 100644 --- a/drivers/tty/serial/meson_uart.c +++ b/drivers/tty/serial/meson_uart.c @@ -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) { -- 2.9.0