From rmk+greg=kroah.com@arm.linux.org.uk Thu Jan 5 06:42:51 2006 From: Russell King CC: Greg K-H , INPUT Subject: [CFT 17/29] Add gameport bus_type probe and remove methods Date: Thu, 05 Jan 2006 14:38:22 +0000 Message-ID: <20060105142951.13.17@flint.arm.linux.org.uk> Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman --- drivers/input/gameport/gameport.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) --- gregkh-2.6.orig/drivers/input/gameport/gameport.c +++ gregkh-2.6/drivers/input/gameport/gameport.c @@ -50,9 +50,7 @@ static DECLARE_MUTEX(gameport_sem); static LIST_HEAD(gameport_list); -static struct bus_type gameport_bus = { - .name = "gameport", -}; +static struct bus_type gameport_bus; static void gameport_add_port(struct gameport *gameport); static void gameport_destroy_port(struct gameport *gameport); @@ -703,11 +701,15 @@ static int gameport_driver_remove(struct return 0; } +static struct bus_type gameport_bus = { + .name = "gameport", + .probe = gameport_driver_probe, + .remove = gameport_driver_remove, +}; + void __gameport_register_driver(struct gameport_driver *drv, struct module *owner) { drv->driver.bus = &gameport_bus; - drv->driver.probe = gameport_driver_probe; - drv->driver.remove = gameport_driver_remove; gameport_queue_event(drv, owner, GAMEPORT_REGISTER_DRIVER); }