diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 19:42:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 19:42:40 +0100 |
| commit | 3e2b32b69308e974cd1167beaf266d3c716e4734 (patch) | |
| tree | 0f1b24dcb7b066a6322d33235b95655d885695ac /drivers/input/serio | |
| parent | [PATCH] remove unused tmp_buf_sem's (diff) | |
| parent | [PATCH] device_shutdown can loop if the driver frees itself (diff) | |
| download | linux-3e2b32b69308e974cd1167beaf266d3c716e4734.tar.xz linux-3e2b32b69308e974cd1167beaf266d3c716e4734.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/serio.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index 8e530cc970e1..2f76813c3a64 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c @@ -59,9 +59,7 @@ static DECLARE_MUTEX(serio_sem); static LIST_HEAD(serio_list); -static struct bus_type serio_bus = { - .name = "serio", -}; +static struct bus_type serio_bus; static void serio_add_port(struct serio *serio); static void serio_destroy_port(struct serio *serio); @@ -750,11 +748,15 @@ static int serio_driver_remove(struct device *dev) return 0; } +static struct bus_type serio_bus = { + .name = "serio", + .probe = serio_driver_probe, + .remove = serio_driver_remove, +}; + void __serio_register_driver(struct serio_driver *drv, struct module *owner) { drv->driver.bus = &serio_bus; - drv->driver.probe = serio_driver_probe; - drv->driver.remove = serio_driver_remove; serio_queue_event(drv, owner, SERIO_REGISTER_DRIVER); } |