From rmk+greg=kroah.com@arm.linux.org.uk Thu Jan 5 06:49:03 2006 From: Russell King CC: Greg K-H , Matt Porter Subject: [CFT 28/29] Add rio_bus_type probe and remove methods Date: Thu, 05 Jan 2006 14:44:14 +0000 Message-ID: <20060105142951.13.28@flint.arm.linux.org.uk> Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman --- drivers/rapidio/rio-driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- gregkh-2.6.orig/drivers/rapidio/rio-driver.c +++ gregkh-2.6/drivers/rapidio/rio-driver.c @@ -147,8 +147,6 @@ int rio_register_driver(struct rio_drive /* 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, }; /**