From b50569b71dfb110a58aa3e83f629115291802a74 Mon Sep 17 00:00:00 2001 From: Scott Long Date: Sun, 17 Jun 2007 05:55:54 +0000 Subject: 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. --- sys/dev/isp/isp_freebsd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sys/dev/isp') diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index 7db7b24749443..14a1d63a7a4bc 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -156,7 +156,7 @@ isp_attach(ispsoftc_t *isp) } ISP_LOCK(isp); - if (xpt_bus_register(sim, primary) != CAM_SUCCESS) { + if (xpt_bus_register(sim, isp->isp_dev, primary) != CAM_SUCCESS) { cam_sim_free(sim, TRUE); return; } @@ -191,7 +191,8 @@ isp_attach(ispsoftc_t *isp) config_intrhook_disestablish(&isp->isp_osinfo.ehook); return; } - if (xpt_bus_register(sim, secondary) != CAM_SUCCESS) { + if (xpt_bus_register(sim, isp->isp_dev, secondary) != + CAM_SUCCESS) { xpt_bus_deregister(cam_sim_path(isp->isp_sim)); xpt_free_path(isp->isp_path); cam_sim_free(sim, TRUE); -- cgit v1.3