Merge master.kernel.org:/home/rmk/linux-2.6-serial

2 files changed, 14 insertions, 20 deletions

diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 23b8871e74cc..5690594b257b 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -5041,17 +5041,3 @@ rs_init(void)
 /* this makes sure that rs_init is called during kernel boot */
 
 module_init(rs_init);
-
-/*
- * register_serial and unregister_serial allows for serial ports to be
- * configured at run-time, to support PCMCIA modems.
- */
-int
-register_serial(struct serial_struct *req)
-{
-        return -1;
-}
-
-void unregister_serial(int line)
-{
-}
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index dea156a62d0a..2d8622eef701 100644
--- a/drivers/serial/serial_core.c
+++ b/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