diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-10-30 00:07:50 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-30 09:29:05 -0400 |
commit | a6c2490f010d9235b1424110c6f414460e41dfe1 (patch) | |
tree | 2c7d6773739791bfa0510e1ea27e88a3e5ab4cdb /drivers/input/serio/pcips2.c | |
parent | dde4ac07263161264d089c7556d0295487787b77 (diff) |
Input: struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio/pcips2.c')
-rw-r--r-- | drivers/input/serio/pcips2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c index 1b404f9e3bff..1dacbe0d9348 100644 --- a/drivers/input/serio/pcips2.c +++ b/drivers/input/serio/pcips2.c | |||
@@ -153,7 +153,7 @@ static int __devinit pcips2_probe(struct pci_dev *dev, const struct pci_device_i | |||
153 | serio->open = pcips2_open; | 153 | serio->open = pcips2_open; |
154 | serio->close = pcips2_close; | 154 | serio->close = pcips2_close; |
155 | strlcpy(serio->name, pci_name(dev), sizeof(serio->name)); | 155 | strlcpy(serio->name, pci_name(dev), sizeof(serio->name)); |
156 | strlcpy(serio->phys, dev->dev.bus_id, sizeof(serio->phys)); | 156 | strlcpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys)); |
157 | serio->port_data = ps2if; | 157 | serio->port_data = ps2if; |
158 | serio->dev.parent = &dev->dev; | 158 | serio->dev.parent = &dev->dev; |
159 | ps2if->io = serio; | 159 | ps2if->io = serio; |