diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 20:02:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 20:02:07 -0500 |
| commit | 40d7ee5d162203b40b5f4fbb312ab016edddb97f (patch) | |
| tree | 432db33df85f7f244676127a189a828dfbf2877b /drivers/serial | |
| parent | 5fec8bdbf9a1c4df4ad3f20e52aa2d8caed490c8 (diff) | |
| parent | b8ac9fc0e8cda9f9776019c5b0464b0c6d2d4c90 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (60 commits)
uio: make uio_info's name and version const
UIO: Documentation for UIO ioport info handling
UIO: Pass information about ioports to userspace (V2)
UIO: uio_pdrv_genirq: allow custom irq_flags
UIO: use pci_ioremap_bar() in drivers/uio
arm: struct device - replace bus_id with dev_name(), dev_set_name()
libata: struct device - replace bus_id with dev_name(), dev_set_name()
avr: struct device - replace bus_id with dev_name(), dev_set_name()
block: struct device - replace bus_id with dev_name(), dev_set_name()
chris: struct device - replace bus_id with dev_name(), dev_set_name()
dmi: struct device - replace bus_id with dev_name(), dev_set_name()
gadget: struct device - replace bus_id with dev_name(), dev_set_name()
gpio: struct device - replace bus_id with dev_name(), dev_set_name()
gpu: struct device - replace bus_id with dev_name(), dev_set_name()
hwmon: struct device - replace bus_id with dev_name(), dev_set_name()
i2o: struct device - replace bus_id with dev_name(), dev_set_name()
IA64: struct device - replace bus_id with dev_name(), dev_set_name()
i7300_idle: struct device - replace bus_id with dev_name(), dev_set_name()
infiniband: struct device - replace bus_id with dev_name(), dev_set_name()
ISDN: struct device - replace bus_id with dev_name(), dev_set_name()
...
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_core.c | 4 |
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, |