[PATCH] Add rio_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>

diff --git a/drivers/rapidio/rio-driver.c b/drivers/rapidio/rio-driver.c
index dc74960..5480119 100644 (file)
--- a/drivers/rapidio/rio-driver.c
+++ b/drivers/rapidio/rio-driver.c
@@ -147,8 +147,6 @@ int rio_register_driver(struct rio_driver *rdrv)
        /* initialize common driver fields */
        rdrv->driver.name = rdrv->name;
        rdrv->driver.bus = &rio_bus_type;
-       rdrv->driver.probe = rio_device_probe;
-       rdrv->driver.remove = rio_device_remove;
 
        /* register with core */
        return driver_register(&rdrv->driver);
@@ -204,7 +202,9 @@ static struct device rio_bus = {
 struct bus_type rio_bus_type = {
        .name = "rapidio",
        .match = rio_match_bus,
-       .dev_attrs = rio_dev_attrs
+       .dev_attrs = rio_dev_attrs,
+       .probe = rio_device_probe,
+       .remove = rio_device_remove,
 };
 
 /**