Эх сурвалжийг харах

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 <tony@atomide.com>
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Markus Pargmann 12 жил өмнө
parent
commit
4a818a09c0

+ 3 - 3
drivers/tty/serial/omap-serial.c

@@ -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;