[CFT 9/29] Add tiocx bus_type probe/remove methods

Russell King
2006-01-05T14:34:06Z

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

---
arch/ia64/sn/kernel/tiocx.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)

diff -up -x BitKeeper -x ChangeSet -x SCCS -x _xlk -x *.orig -x *.rej -x .git linus/arch/ia64/sn/kernel/tiocx.c linux/arch/ia64/sn/kernel/tiocx.c
--- linus/arch/ia64/sn/kernel/tiocx.c Sun Nov 6 22:14:30 2005
+++ linux/arch/ia64/sn/kernel/tiocx.c Sun Nov 13 16:07:12 2005
@@ -76,12 +76,6 @@ static void tiocx_bus_release(struct dev
kfree(to_cx_dev(dev));
}

-struct bus_type tiocx_bus_type = {
- .name = "tiocx",
- .match = tiocx_match,
- .hotplug = tiocx_hotplug,
-};
-
/**
* cx_device_match - Find cx_device in the id table.
* @ids: id table from driver
@@ -148,6 +142,14 @@ static int cx_driver_remove(struct devic
return 0;
}

+struct bus_type tiocx_bus_type = {
+ .name = "tiocx",
+ .match = tiocx_match,
+ .hotplug = tiocx_hotplug,
+ .probe = cx_device_probe,
+ .remove = cx_device_remove,
+};
+
/**
* cx_driver_register - Register the driver.
* @cx_driver: driver table (cx_drv struct) from driver
@@ -161,8 +163,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);
}