aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-02-05 16:12:31 -0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-05 11:13:51 -0800
commitcdc8da3998dcc50cee2f81904c16ebdbd7ec2cee (patch)
treedc09b48a5fd54a3e78c3e93bfae2b0237c8062f5 /drivers/tty
parentb16ea4b04c3b74524805a409ee2747b751b7a138 (diff)
downloadkernel_goldelico_gta04-cdc8da3998dcc50cee2f81904c16ebdbd7ec2cee.zip
kernel_goldelico_gta04-cdc8da3998dcc50cee2f81904c16ebdbd7ec2cee.tar.gz
kernel_goldelico_gta04-cdc8da3998dcc50cee2f81904c16ebdbd7ec2cee.tar.bz2
serial: imx: Move imx_port_ucrs_save/restore under CONFIG_CONSOLE_POLL
If CONFIG_CONSOLE_POLL is not defined, the following build warning happens: 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] Move imx_port_ucrs_saver/restore under CONFIG_CONSOLE_POLL ifdef block to fix it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/imx.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index a220f77..a657f96 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -269,27 +269,6 @@ static inline int is_imx21_uart(struct imx_port *sport)
}
/*
- * Save and restore functions for UCR1, UCR2 and UCR3 registers
- */
-static void imx_port_ucrs_save(struct uart_port *port,
- struct imx_port_ucrs *ucr)
-{
- /* save control registers */
- ucr->ucr1 = readl(port->membase + UCR1);
- ucr->ucr2 = readl(port->membase + UCR2);
- ucr->ucr3 = readl(port->membase + UCR3);
-}
-
-static void imx_port_ucrs_restore(struct uart_port *port,
- struct imx_port_ucrs *ucr)
-{
- /* restore control registers */
- writel(ucr->ucr1, port->membase + UCR1);
- writel(ucr->ucr2, port->membase + UCR2);
- writel(ucr->ucr3, port->membase + UCR3);
-}
-
-/*
* Handle any change of modem status signal since we were last called.
*/
static void imx_mctrl_check(struct imx_port *sport)
@@ -1103,6 +1082,27 @@ imx_verify_port(struct uart_port *port, struct serial_struct *ser)
}
#if defined(CONFIG_CONSOLE_POLL)
+/*
+ * Save and restore functions for UCR1, UCR2 and UCR3 registers
+ */
+static void imx_port_ucrs_save(struct uart_port *port,
+ struct imx_port_ucrs *ucr)
+{
+ /* save control registers */
+ ucr->ucr1 = readl(port->membase + UCR1);
+ ucr->ucr2 = readl(port->membase + UCR2);
+ ucr->ucr3 = readl(port->membase + UCR3);
+}
+
+static void imx_port_ucrs_restore(struct uart_port *port,
+ struct imx_port_ucrs *ucr)
+{
+ /* restore control registers */
+ writel(ucr->ucr1, port->membase + UCR1);
+ writel(ucr->ucr2, port->membase + UCR2);
+ writel(ucr->ucr3, port->membase + UCR3);
+}
+
static int imx_poll_get_char(struct uart_port *port)
{
struct imx_port_ucrs old_ucr;