]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
serial: imx: Fix warning when !CONFIG_SERIAL_IMX_CONSOLE
authorFabio Estevam <fabio.estevam@freescale.com>
Wed, 5 Jun 2013 03:58:46 +0000 (00:58 -0300)
committerJason Liu <r64343@freescale.com>
Wed, 30 Oct 2013 01:54:03 +0000 (09:54 +0800)
When CONFIG_SERIAL_IMX_CONSOLE is not selected the following build warnings
appear:

drivers/tty/serial/imx.c:274:13: warning: 'imx_port_ucrs_save' defined but not used [-Wunused-function]
drivers/tty/serial/imx.c:283:13: warning: 'imx_port_ucrs_restore' defined but not used [-Wunused-function]

imx_port_ucrs_save() and imx_port_ucrs_restore() are only used when
CONFIG_CONSOLE_POLL or CONFIG_SERIAL_IMX_CONSOLE are selected, so protect these
functions declaration with a proper ifdef.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Huang Shijie <b32955@freescale.com>
drivers/tty/serial/imx.c

index d290274e063ca47ecca19946bb7b03d06700a908..7a761f7c9781dd28a6402ae754eb57f42d50ef3f 100644 (file)
@@ -272,6 +272,7 @@ static inline int is_imx21_uart(struct imx_port *sport)
 /*
  * Save and restore functions for UCR1, UCR2 and UCR3 registers
  */
+#if defined(CONFIG_CONSOLE_POLL) || defined(CONFIG_SERIAL_IMX_CONSOLE)
 static void imx_port_ucrs_save(struct uart_port *port,
                               struct imx_port_ucrs *ucr)
 {
@@ -289,6 +290,7 @@ static void imx_port_ucrs_restore(struct uart_port *port,
        writel(ucr->ucr2, port->membase + UCR2);
        writel(ucr->ucr3, port->membase + UCR3);
 }
+#endif
 
 /*
  * Handle any change of modem status signal since we were last called.