aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/omap-serial.c
diff options
context:
space:
mode:
authorMarkus Pargmann <mpa@pengutronix.de>2014-01-24 12:09:41 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-13 12:56:08 -0500
commitce6acca65ee42c06ac54ec9ba918865d06cee29d (patch)
tree2c9cb90381f6378f42faaf337931b1a6acf0da5a /drivers/tty/serial/omap-serial.c
parentd8a5dc3033af2fd6d16030d2ee4fbd073460fe54 (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 can cause lots of extra messages at boot time, slowing things down. It is caused by commit 2a0b965cfb6e (serial: omap: Add support for optional wake-up) which was applied for v3.13-rc1. This patch moves the infomessage to the probe function to display it only once. Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: stable <stable@vger.kernel.org> # 3.13 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/omap-serial.c')
-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)
738 return retval; 738 return retval;
739 } 739 }
740 disable_irq(up->wakeirq); 740 disable_irq(up->wakeirq);
741 } else {
742 dev_info(up->port.dev, "no wakeirq for uart%d\n",
743 up->port.line);
744 } 741 }
745 742
746 dev_dbg(up->port.dev, "serial_omap_startup+%d\n", up->port.line); 743 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)
1687 up->port.iotype = UPIO_MEM; 1684 up->port.iotype = UPIO_MEM;
1688 up->port.irq = uartirq; 1685 up->port.irq = uartirq;
1689 up->wakeirq = wakeirq; 1686 up->wakeirq = wakeirq;
1687 if (!up->wakeirq)
1688 dev_info(up->port.dev, "no wakeirq for uart%d\n",
1689 up->port.line);
1690 1690
1691 up->port.regshift = 2; 1691 up->port.regshift = 2;
1692 up->port.fifosize = 64; 1692 up->port.fifosize = 64;