summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-10-31 12:42:22 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-10-31 12:42:22 +0100
commit0cf669d5c5d08eb827df9867429df21cf030eba6 (patch)
tree6eb72f3c25f7acc0e67d0e954be8ee4525fbd4c7
parentpowerpc: import a fix from arch/ppc/mm/pgtable.c (diff)
downloadlinux-0cf669d5c5d08eb827df9867429df21cf030eba6.tar.xz
linux-0cf669d5c5d08eb827df9867429df21cf030eba6.zip
[SERIAL] Arrange better identification of ports
Folk seem to get confused when they see two or more ttyS0 ports appearing at boot time. One comes from the legacy table, and one from PNP. Hence, display the bus ID of the device which supplied the port. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/serial/serial_core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 401d94a7fe2e..0745ce782974 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1967,7 +1967,9 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)
break;
}
- printk(KERN_INFO "%s%d at %s (irq = %d) is a %s\n",
+ printk(KERN_INFO "%s%s%s%d at %s (irq = %d) is a %s\n",
+ port->dev ? port->dev->bus_id : "",
+ port->dev ? ": " : "",
drv->dev_name, port->line, address, port->irq, uart_type(port));
}