diff options
author | Russell King <rmk@arm.linux.org.uk> | 2006-01-05 09:38:22 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-13 14:26:07 -0500 |
commit | 29a4a20e9fe7459f9d464b8be070ce8b7335be7e (patch) | |
tree | fab8064c3d917482ee8c885ed10f75860f240d70 /drivers/input/gameport | |
parent | b864c7d5d17c171c4ead0791b44ab05d7a21dc0c (diff) |
[PATCH] Add gameport 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/input/gameport')
-rw-r--r-- | drivers/input/gameport/gameport.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c index caac6d63d46f..b765a155c008 100644 --- a/drivers/input/gameport/gameport.c +++ b/drivers/input/gameport/gameport.c | |||
@@ -50,9 +50,7 @@ static DECLARE_MUTEX(gameport_sem); | |||
50 | 50 | ||
51 | static LIST_HEAD(gameport_list); | 51 | static LIST_HEAD(gameport_list); |
52 | 52 | ||
53 | static struct bus_type gameport_bus = { | 53 | static struct bus_type gameport_bus; |
54 | .name = "gameport", | ||
55 | }; | ||
56 | 54 | ||
57 | static void gameport_add_port(struct gameport *gameport); | 55 | static void gameport_add_port(struct gameport *gameport); |
58 | static void gameport_destroy_port(struct gameport *gameport); | 56 | static void gameport_destroy_port(struct gameport *gameport); |
@@ -703,11 +701,15 @@ static int gameport_driver_remove(struct device *dev) | |||
703 | return 0; | 701 | return 0; |
704 | } | 702 | } |
705 | 703 | ||
704 | static struct bus_type gameport_bus = { | ||
705 | .name = "gameport", | ||
706 | .probe = gameport_driver_probe, | ||
707 | .remove = gameport_driver_remove, | ||
708 | }; | ||
709 | |||
706 | void __gameport_register_driver(struct gameport_driver *drv, struct module *owner) | 710 | void __gameport_register_driver(struct gameport_driver *drv, struct module *owner) |
707 | { | 711 | { |
708 | drv->driver.bus = &gameport_bus; | 712 | drv->driver.bus = &gameport_bus; |
709 | drv->driver.probe = gameport_driver_probe; | ||
710 | drv->driver.remove = gameport_driver_remove; | ||
711 | gameport_queue_event(drv, owner, GAMEPORT_REGISTER_DRIVER); | 713 | gameport_queue_event(drv, owner, GAMEPORT_REGISTER_DRIVER); |
712 | } | 714 | } |
713 | 715 | ||