diff options
| author | scottl <scottl@FreeBSD.org> | 2007-04-18 04:58:53 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2007-04-18 04:58:53 +0000 |
| commit | a40b57339d0ae20db108ee7c13ef670039d1f2c7 (patch) | |
| tree | 7a504d9115e85179155d0fb6137bd3588944fe08 /sys/dev | |
| parent | 4db8f3e0cc218ebbc69857ffdd274e67b815cd31 (diff) | |
| download | FreeBSD-src-a40b57339d0ae20db108ee7c13ef670039d1f2c7.zip FreeBSD-src-a40b57339d0ae20db108ee7c13ef670039d1f2c7.tar.gz | |
Revert a driver API change to xpt_alloc_ccb that isn't necessary. Fix a
couple of associated error checks.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isp/isp_freebsd.c | 2 | ||||
| -rw-r--r-- | sys/dev/mpt/mpt_cam.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index 6c4fd06..85b292f 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -2148,7 +2148,7 @@ isp_make_here(ispsoftc_t *isp, int tgt) * Allocate a CCB, create a wildcard path for this bus, * and schedule a rescan. */ - ccb = xpt_alloc_ccb_nowait(isp->isp_osinfo.sim); + ccb = xpt_alloc_ccb_nowait(); if (ccb == NULL) { isp_prt(isp, ISP_LOGWARN, "unable to alloc CCB for rescan"); CAMLOCK_2_ISPLOCK(mpt); diff --git a/sys/dev/mpt/mpt_cam.c b/sys/dev/mpt/mpt_cam.c index 5d7c5a5..2276ce2 100644 --- a/sys/dev/mpt/mpt_cam.c +++ b/sys/dev/mpt/mpt_cam.c @@ -2087,7 +2087,6 @@ mpt_cam_event(struct mpt_softc *mpt, request_t *req, { union ccb *ccb; uint32_t pathid; - struct cam_sim *sim; /* * In general this means a device has been added to the loop. */ @@ -2096,17 +2095,16 @@ mpt_cam_event(struct mpt_softc *mpt, request_t *req, break; } if (mpt->phydisk_sim) { - sim = mpt->phydisk_sim; + pathid = cam_sim_path(mpt->phydisk_sim); } else { - sim = mpt->sim; + pathid = cam_sim_path(mpt->sim); } - pathid = cam_sim_path(sim); MPTLOCK_2_CAMLOCK(mpt); /* * Allocate a CCB, create a wildcard path for this bus, * and schedule a rescan. */ - ccb = xpt_alloc_ccb_nowait(sim); + ccb = xpt_alloc_ccb_nowait(); if (ccb == NULL) { mpt_prt(mpt, "unable to alloc CCB for rescan\n"); CAMLOCK_2_MPTLOCK(mpt); |
