aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Pargmann <[email protected]>2014-01-24 18:09:41 +0100
committerGreg Kroah-Hartman <[email protected]>2014-02-13 09:17:30 -0800
commit4a818a09c050ebd0d99398742016bdf7e788be2a (patch)
treefbf14bf0922671840ecf7ee70117642c8806a6e1
parentf7e54d7ad743a0cf0e400ac185036df6a592567c (diff)
serial: omap-serial: Move info message to probe function
Currently the info message about a missing wakeirq for uart is printed every time the serial driver's startup function is called. This happens multiple times and not just once. This patch moves the infomessage to the probe function to display it only once. Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Markus Pargmann <[email protected]> Acked-by: Uwe Kleine-König <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/tty/serial/omap-serial.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index fa511ebab67c..205158173090 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -738,9 +738,6 @@ static int serial_omap_startup(struct uart_port *port)
return retval;
}
disable_irq(up->wakeirq);
- } else {
- dev_info(up->port.dev, "no wakeirq for uart%d\n",
- up->port.line);
}
dev_dbg(up->port.dev, "serial_omap_startup+%d\n", up->port.line);
@@ -1687,6 +1684,9 @@ static int serial_omap_probe(struct platform_device *pdev)
up->port.iotype = UPIO_MEM;
up->port.irq = uartirq;
up->wakeirq = wakeirq;
+ if (!up->wakeirq)
+ dev_info(up->port.dev, "no wakeirq for uart%d\n",
+ up->port.line);
up->port.regshift = 2;
up->port.fifosize = 64;