summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@arm.linux.org.uk>2006-01-05 15:44:14 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-13 20:26:10 +0100
commitfc3d3ddd3e628d9f22d4aa56a640d0b31c977a8f (patch)
tree78d353c96c168963c12a666bcfabaf87df6cec99
parent[PATCH] Add zorro_bus_type probe and remove methods (diff)
downloadlinux-fc3d3ddd3e628d9f22d4aa56a640d0b31c977a8f.tar.xz
linux-fc3d3ddd3e628d9f22d4aa56a640d0b31c977a8f.zip
[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>
-rw-r--r--drivers/rapidio/rio-driver.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rapidio/rio-driver.c b/drivers/rapidio/rio-driver.c
index dc749609699a..5480119ff9d3 100644
--- 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,
};
/**