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/ciss/ciss.c | |
| 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/ciss/ciss.c')
| -rw-r--r-- | sys/dev/ciss/ciss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index 522afa5..64b1cc9 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -2503,7 +2503,7 @@ ciss_cam_init(struct ciss_softc *sc) */ mtx_lock(&sc->ciss_mtx); if (i == 0 || sc->ciss_controllers[i].physical.bus != 0) { - if (xpt_bus_register(sc->ciss_cam_sim[i], i) != 0) { + if (xpt_bus_register(sc->ciss_cam_sim[i], sc->ciss_dev, i) != 0) { ciss_printf(sc, "can't register SCSI bus %d\n", i); mtx_unlock(&sc->ciss_mtx); return (ENXIO); @@ -2525,7 +2525,7 @@ ciss_cam_init(struct ciss_softc *sc) } mtx_lock(&sc->ciss_mtx); - if (xpt_bus_register(sc->ciss_cam_sim[i], i) != 0) { + if (xpt_bus_register(sc->ciss_cam_sim[i], sc->ciss_dev, i) != 0) { ciss_printf(sc, "can't register SCSI bus %d\n", i); mtx_unlock(&sc->ciss_mtx); return (ENXIO); |
