diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 19:38:21 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:38:21 -0400 |
commit | 65a212dd71ffd99c83ad780205932fcb96a973b6 (patch) | |
tree | 5874a427105d42b08bb04938a32802815f570081 /drivers/serial/sunzilog.c | |
parent | 1173960b0e85761811a421eb0bbcefb117eb7535 (diff) |
serial: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: davem@davemloft.net
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Diffstat (limited to 'drivers/serial/sunzilog.c')
-rw-r--r-- | drivers/serial/sunzilog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 45a299f35617..e09d3cebb4fb 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c | |||
@@ -1438,12 +1438,12 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m | |||
1438 | } else { | 1438 | } else { |
1439 | printk(KERN_INFO "%s: Keyboard at MMIO 0x%llx (irq = %d) " | 1439 | printk(KERN_INFO "%s: Keyboard at MMIO 0x%llx (irq = %d) " |
1440 | "is a %s\n", | 1440 | "is a %s\n", |
1441 | op->dev.bus_id, | 1441 | dev_name(&op->dev), |
1442 | (unsigned long long) up[0].port.mapbase, | 1442 | (unsigned long long) up[0].port.mapbase, |
1443 | op->irqs[0], sunzilog_type(&up[0].port)); | 1443 | op->irqs[0], sunzilog_type(&up[0].port)); |
1444 | printk(KERN_INFO "%s: Mouse at MMIO 0x%llx (irq = %d) " | 1444 | printk(KERN_INFO "%s: Mouse at MMIO 0x%llx (irq = %d) " |
1445 | "is a %s\n", | 1445 | "is a %s\n", |
1446 | op->dev.bus_id, | 1446 | dev_name(&op->dev), |
1447 | (unsigned long long) up[1].port.mapbase, | 1447 | (unsigned long long) up[1].port.mapbase, |
1448 | op->irqs[0], sunzilog_type(&up[1].port)); | 1448 | op->irqs[0], sunzilog_type(&up[1].port)); |
1449 | kbm_inst++; | 1449 | kbm_inst++; |