From rmk+greg=kroah.com@arm.linux.org.uk Thu Jan 5 06:42:55 2006 From: Russell King CC: Greg K-H , INPUT Subject: [CFT 18/29] Add serio bus_type probe and remove methods Date: Thu, 05 Jan 2006 14:38:53 +0000 Message-ID: <20060105142951.13.18@flint.arm.linux.org.uk> Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman --- drivers/input/serio/serio.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) --- gregkh-2.6.orig/drivers/input/serio/serio.c +++ gregkh-2.6/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 de 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); }