summaryrefslogtreecommitdiffstats
path: root/sys/dev/aac/aac_cam.c
diff options
context:
space:
mode:
authorscottl <scottl@FreeBSD.org>2004-08-12 05:05:06 +0000
committerscottl <scottl@FreeBSD.org>2004-08-12 05:05:06 +0000
commit1db9aa9537d6d9b2645e4fc9515113e08648c659 (patch)
tree1077aa17f239a98ecd7466601b1274f9e18524f2 /sys/dev/aac/aac_cam.c
parent1904a6897a1ac9696ca872ec7446d0ea103d2f3d (diff)
downloadFreeBSD-src-1db9aa9537d6d9b2645e4fc9515113e08648c659.zip
FreeBSD-src-1db9aa9537d6d9b2645e4fc9515113e08648c659.tar.gz
Remove the AAC_LOCK macros. They no longer abstract anything and only
obfuscate the code. No functional differences.
Diffstat (limited to 'sys/dev/aac/aac_cam.c')
-rw-r--r--sys/dev/aac/aac_cam.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/aac/aac_cam.c b/sys/dev/aac/aac_cam.c
index ffe322b..06149a9 100644
--- a/sys/dev/aac/aac_cam.c
+++ b/sys/dev/aac/aac_cam.c
@@ -290,9 +290,9 @@ aac_cam_action(struct cam_sim *sim, union ccb *ccb)
/* Async ops that require communcation with the controller */
- AAC_LOCK_ACQUIRE(&sc->aac_io_lock);
+ mtx_lock(&sc->aac_io_lock);
if (aac_alloc_command(sc, &cm)) {
- AAC_LOCK_RELEASE(&sc->aac_io_lock);
+ mtx_unlock(&sc->aac_io_lock);
xpt_freeze_simq(sim, 1);
ccb->ccb_h.status = CAM_REQUEUE_REQ;
xpt_done(ccb);
@@ -413,7 +413,7 @@ aac_cam_action(struct cam_sim *sim, union ccb *ccb)
aac_enqueue_ready(cm);
aac_startio(cm->cm_sc);
- AAC_LOCK_RELEASE(&sc->aac_io_lock);
+ mtx_unlock(&sc->aac_io_lock);
return;
}
@@ -496,11 +496,11 @@ aac_cam_complete(struct aac_command *cm)
aac_release_command(cm);
- AAC_LOCK_RELEASE(&sc->aac_io_lock);
+ mtx_unlock(&sc->aac_io_lock);
mtx_lock(&Giant);
xpt_done(ccb);
mtx_unlock(&Giant);
- AAC_LOCK_ACQUIRE(&sc->aac_io_lock);
+ mtx_lock(&sc->aac_io_lock);
return;
}
OpenPOWER on IntegriCloud