From rmk+greg=kroah.com@arm.linux.org.uk Thu Jan 5 06:37:15 2006 From: Russell King CC: Greg K-H , IA64 Subject: [CFT 9/29] Add tiocx bus_type probe/remove methods Date: Thu, 05 Jan 2006 14:34:06 +0000 Message-ID: <20060105142951.13.09@flint.arm.linux.org.uk> Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman --- arch/ia64/sn/kernel/tiocx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) --- gregkh-2.6.orig/arch/ia64/sn/kernel/tiocx.c +++ gregkh-2.6/arch/ia64/sn/kernel/tiocx.c @@ -77,12 +77,6 @@ static void tiocx_bus_release(struct dev kfree(to_cx_dev(dev)); } -struct bus_type tiocx_bus_type = { - .name = "tiocx", - .match = tiocx_match, - .uevent = tiocx_uevent, -}; - /** * cx_device_match - Find cx_device in the id table. * @ids: id table from driver @@ -149,6 +143,14 @@ static int cx_driver_remove(struct devic return 0; } +struct bus_type tiocx_bus_type = { + .name = "tiocx", + .match = tiocx_match, + .uevent = tiocx_uevent, + .probe = cx_device_probe, + .remove = cx_driver_remove, +}; + /** * cx_driver_register - Register the driver. * @cx_driver: driver table (cx_drv struct) from driver @@ -162,8 +164,6 @@ int cx_driver_register(struct cx_drv *cx { cx_driver->driver.name = cx_driver->name; cx_driver->driver.bus = &tiocx_bus_type; - cx_driver->driver.probe = cx_device_probe; - cx_driver->driver.remove = cx_driver_remove; return driver_register(&cx_driver->driver); }