diff options
author | Russell King <rmk@arm.linux.org.uk> | 2006-01-05 09:38:53 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-13 14:26:07 -0500 |
commit | 30226f8199cb7f5ace767f65bcebb85941612dfc (patch) | |
tree | 8155e420d407bf831aa6aa838328a5a2fbfe3ee0 /drivers | |
parent | 29a4a20e9fe7459f9d464b8be070ce8b7335be7e (diff) |
[PATCH] Add serio bus_type probe and remove methods
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-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); | |||
59 | 59 | ||
60 | static LIST_HEAD(serio_list); | 60 | static LIST_HEAD(serio_list); |
61 | 61 | ||
62 | static struct bus_type serio_bus = { | 62 | static struct bus_type serio_bus; |
63 | .name = "serio", | ||
64 | }; | ||
65 | 63 | ||
66 | static void serio_add_port(struct serio *serio); | 64 | static void serio_add_port(struct serio *serio); |
67 | static void serio_destroy_port(struct serio *serio); | 65 | static void serio_destroy_port(struct serio *serio); |
@@ -750,11 +748,15 @@ static int serio_driver_remove(struct device *dev) | |||
750 | return 0; | 748 | return 0; |
751 | } | 749 | } |
752 | 750 | ||
751 | static struct bus_type serio_bus = { | ||
752 | .name = "serio", | ||
753 | .probe = serio_driver_probe, | ||
754 | .remove = serio_driver_remove, | ||
755 | }; | ||
756 | |||
753 | void __serio_register_driver(struct serio_driver *drv, struct module *owner) | 757 | void __serio_register_driver(struct serio_driver *drv, struct module *owner) |
754 | { | 758 | { |
755 | drv->driver.bus = &serio_bus; | 759 | drv->driver.bus = &serio_bus; |
756 | drv->driver.probe = serio_driver_probe; | ||
757 | drv->driver.remove = serio_driver_remove; | ||
758 | 760 | ||
759 | serio_queue_event(drv, owner, SERIO_REGISTER_DRIVER); | 761 | serio_queue_event(drv, owner, SERIO_REGISTER_DRIVER); |
760 | } | 762 | } |