Prepare for future integration between CAM and newbus. xpt_bus_register

now takes a device_t to be the parent of the bus that is being created.
Most SIMs have been updated with a reasonable argument, but a few exceptions
just pass NULL for now.  This argument isn't used yet and the newbus
integration likely won't be ready until after 7.0-RELEASE.

3 files changed, 3 insertions, 3 deletions

diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index 79c1f06..7027bcf 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -1423,7 +1423,7 @@ adv_attach(adv)
 	 *
 	 * XXX Twin Channel EISA Cards???
 	 */
-	if (xpt_bus_register(adv->sim, 0) != CAM_SUCCESS) {
+	if (xpt_bus_register(adv->sim, adv->dev, 0) != CAM_SUCCESS) {
 		cam_sim_free(adv->sim, /*free devq*/TRUE);
 		return (ENXIO);
 	}
diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index f7a3acb..ac7da33 100644
--- a/sys/dev/advansys/advlib.h
+++ b/sys/dev/advansys/advlib.h
@@ -493,7 +493,7 @@ struct adv_target_transinfo {
 };
 
 struct adv_softc {
-	device_t		dev;
+	device_t		 dev;
 	bus_space_tag_t		 tag;
 	bus_space_handle_t	 bsh;
 	struct cam_sim		*sim;
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index 2ba42da..7e3b4f4 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -1243,7 +1243,7 @@ adw_attach(struct adw_softc *adw)
 	/*
 	 * Register the bus.
 	 */
-	if (xpt_bus_register(adw->sim, 0) != CAM_SUCCESS) {
+	if (xpt_bus_register(adw->sim, adw->device, 0) != CAM_SUCCESS) {
 		cam_sim_free(adw->sim, /*free devq*/TRUE);
 		error = ENOMEM;
 		goto fail;