kobject: Fix kobject_rename and !CONFIG_SYSFS

[linux-2.6-omap-h63xx.git] / drivers / serial / serial_core.c

diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 0bce1fe2c62a3bbb7073647bb040da61a2f697a5..6bdf3362e3b1e5f743ae8bad1f0bc8c9f682bf08 100644 (file)
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -934,7 +934,7 @@ uart_tiocmset(struct tty_struct *tty, struct file *file,
        return ret;
 }
 
-static void uart_break_ctl(struct tty_struct *tty, int break_state)
+static int uart_break_ctl(struct tty_struct *tty, int break_state)
 {
        struct uart_state *state = tty->driver_data;
        struct uart_port *port = state->port;
@@ -945,6 +945,7 @@ static void uart_break_ctl(struct tty_struct *tty, int break_state)
                port->ops->break_ctl(port, break_state);
 
        mutex_unlock(&state->mutex);
+       return 0;
 }
 
 static int uart_do_autoconfig(struct uart_state *state)
@@ -2050,7 +2051,8 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
                                        "transmitter\n",
                               port->dev ? port->dev->bus_id : "",
                               port->dev ? ": " : "",
-                              drv->dev_name, port->line);
+                              drv->dev_name,
+                              drv->tty_driver->name_base + port->line);
 
                ops->shutdown(port);
        }
@@ -2153,12 +2155,11 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)
 
        switch (port->iotype) {
        case UPIO_PORT:
-               snprintf(address, sizeof(address),
-                        "I/O 0x%x", port->iobase);
+               snprintf(address, sizeof(address), "I/O 0x%lx", port->iobase);
                break;
        case UPIO_HUB6:
                snprintf(address, sizeof(address),
-                        "I/O 0x%x offset 0x%x", port->iobase, port->hub6);
+                        "I/O 0x%lx offset 0x%x", port->iobase, port->hub6);
                break;
        case UPIO_MEM:
        case UPIO_MEM32:
@@ -2176,7 +2177,9 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)
        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));
+              drv->dev_name,
+              drv->tty_driver->name_base + port->line,
+              address, port->irq, uart_type(port));
 }
 
 static void