From 396f39a30e526c137e97f52a01a09affc9bf8729 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 3 Sep 2005 15:30:21 +0100 Subject: [PATCH] --- yaml --- r: 7084 b: refs/heads/master c: 30b7a3bc133c5b4a723163be35157ed709fca91c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/serial_core.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 464d42d1b4b8..a55971c9ca00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d27400746189f3b5194b49575833ea660c430118 +refs/heads/master: 30b7a3bc133c5b4a723163be35157ed709fca91c diff --git a/trunk/drivers/serial/serial_core.c b/trunk/drivers/serial/serial_core.c index dea156a62d0a..2d8622eef701 100644 --- a/trunk/drivers/serial/serial_core.c +++ b/trunk/drivers/serial/serial_core.c @@ -1947,21 +1947,29 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port) static inline void uart_report_port(struct uart_driver *drv, struct uart_port *port) { - printk("%s%d", drv->dev_name, port->line); - printk(" at "); + char address[64]; + switch (port->iotype) { case UPIO_PORT: - printk("I/O 0x%x", port->iobase); + snprintf(address, sizeof(address), + "I/O 0x%x", port->iobase); break; case UPIO_HUB6: - printk("I/O 0x%x offset 0x%x", port->iobase, port->hub6); + snprintf(address, sizeof(address), + "I/O 0x%x offset 0x%x", port->iobase, port->hub6); break; case UPIO_MEM: case UPIO_MEM32: - printk("MMIO 0x%lx", port->mapbase); + snprintf(address, sizeof(address), + "MMIO 0x%lx", port->mapbase); + break; + default: + strlcpy(address, "*unknown*", sizeof(address)); break; } - printk(" (irq = %d) is a %s\n", port->irq, uart_type(port)); + + printk(KERN_INFO "%s%d at %s (irq = %d) is a %s\n", + drv->dev_name, port->line, address, port->irq, uart_type(port)); } static void