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 2a0b965cfb (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>
This commit is contained in:
Markus Pargmann 2014-01-24 18:09:41 +01:00 committed by Greg Kroah-Hartman
parent d8a5dc3033
commit ce6acca65e

View File

@ -738,9 +738,6 @@ static int serial_omap_startup(struct uart_port *port)
return retval; return retval;
} }
disable_irq(up->wakeirq); 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); 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.iotype = UPIO_MEM;
up->port.irq = uartirq; up->port.irq = uartirq;
up->wakeirq = wakeirq; 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.regshift = 2;
up->port.fifosize = 64; up->port.fifosize = 64;