diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-29 22:56:08 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-01-29 23:00:44 -0800 |
commit | 4e8718a1f960db0c48427f4583f89f4cb62f2480 (patch) | |
tree | 244ca94c4639e94257b7c75c62d37783174ebb12 /drivers/input/serio/sa1111ps2.c | |
parent | e8e0c02340f2d3e4f1ea75a136883d8797290929 (diff) | |
download | op-kernel-dev-4e8718a1f960db0c48427f4583f89f4cb62f2480.zip op-kernel-dev-4e8718a1f960db0c48427f4583f89f4cb62f2480.tar.gz |
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/sa1111ps2.c')
-rw-r--r-- | drivers/input/serio/sa1111ps2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c index 2ad8878..57953c0 100644 --- a/drivers/input/serio/sa1111ps2.c +++ b/drivers/input/serio/sa1111ps2.c @@ -246,8 +246,8 @@ static int __devinit ps2_probe(struct sa1111_dev *dev) serio->write = ps2_write; serio->open = ps2_open; serio->close = ps2_close; - strlcpy(serio->name, dev->dev.bus_id, sizeof(serio->name)); - strlcpy(serio->phys, dev->dev.bus_id, sizeof(serio->phys)); + strlcpy(serio->name, dev_name(&dev->dev), sizeof(serio->name)); + strlcpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys)); serio->port_data = ps2if; serio->dev.parent = &dev->dev; ps2if->io = serio; |