diff options
| author | scottl <scottl@FreeBSD.org> | 2007-06-17 05:55:54 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2007-06-17 05:55:54 +0000 |
| commit | ff584e70faf04177b3d2b50035e4e0031ad7e655 (patch) | |
| tree | 1f069a0af9a8c28e09089c8dc789bcd435a94cce /sys/dev/isp | |
| parent | 001175ac64443d5853311173ea76dffb961d6c9f (diff) | |
| download | FreeBSD-src-ff584e70faf04177b3d2b50035e4e0031ad7e655.zip FreeBSD-src-ff584e70faf04177b3d2b50035e4e0031ad7e655.tar.gz | |
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.
Diffstat (limited to 'sys/dev/isp')
| -rw-r--r-- | sys/dev/isp/isp_freebsd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index 7db7b24..14a1d63 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); |
