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/serio.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/serio.c')
-rw-r--r-- | drivers/input/serio/serio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index 2f12d60eee3b..bc033250dfcd 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c | |||
@@ -546,8 +546,8 @@ static void serio_init_port(struct serio *serio) | |||
546 | spin_lock_init(&serio->lock); | 546 | spin_lock_init(&serio->lock); |
547 | mutex_init(&serio->drv_mutex); | 547 | mutex_init(&serio->drv_mutex); |
548 | device_initialize(&serio->dev); | 548 | device_initialize(&serio->dev); |
549 | snprintf(serio->dev.bus_id, sizeof(serio->dev.bus_id), | 549 | dev_set_name(&serio->dev, "serio%ld", |
550 | "serio%ld", (long)atomic_inc_return(&serio_no) - 1); | 550 | (long)atomic_inc_return(&serio_no) - 1); |
551 | serio->dev.bus = &serio_bus; | 551 | serio->dev.bus = &serio_bus; |
552 | serio->dev.release = serio_release_port; | 552 | serio->dev.release = serio_release_port; |
553 | if (serio->parent) { | 553 | if (serio->parent) { |