aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-01-06 13:44:37 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 13:44:37 -0500
commit4bfe090b0a29258eeeb026a09a96cf5b5838ac63 (patch)
tree0098ae1fe3ecabc28e4c65057e413a65b41582fe
parentbb0dc43eeeea6a3ace7fae42e583a9be176eb1f9 (diff)
serial: struct device - replace bus_id with dev_name(), dev_set_name()
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/serial/serial_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index dc68b7e0c930..42f4e66fccaf 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -2030,7 +2030,7 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
2030 if (!tries) 2030 if (!tries)
2031 printk(KERN_ERR "%s%s%s%d: Unable to drain " 2031 printk(KERN_ERR "%s%s%s%d: Unable to drain "
2032 "transmitter\n", 2032 "transmitter\n",
2033 port->dev ? port->dev->bus_id : "", 2033 port->dev ? dev_name(port->dev) : "",
2034 port->dev ? ": " : "", 2034 port->dev ? ": " : "",
2035 drv->dev_name, 2035 drv->dev_name,
2036 drv->tty_driver->name_base + port->line); 2036 drv->tty_driver->name_base + port->line);
@@ -2156,7 +2156,7 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)
2156 } 2156 }
2157 2157
2158 printk(KERN_INFO "%s%s%s%d at %s (irq = %d) is a %s\n", 2158 printk(KERN_INFO "%s%s%s%d at %s (irq = %d) is a %s\n",
2159 port->dev ? port->dev->bus_id : "", 2159 port->dev ? dev_name(port->dev) : "",
2160 port->dev ? ": " : "", 2160 port->dev ? ": " : "",
2161 drv->dev_name, 2161 drv->dev_name,
2162 drv->tty_driver->name_base + port->line, 2162 drv->tty_driver->name_base + port->line,