From 1db9aa9537d6d9b2645e4fc9515113e08648c659 Mon Sep 17 00:00:00 2001 From: scottl Date: Thu, 12 Aug 2004 05:05:06 +0000 Subject: Remove the AAC_LOCK macros. They no longer abstract anything and only obfuscate the code. No functional differences. --- sys/dev/aac/aac_cam.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sys/dev/aac/aac_cam.c') 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; } -- cgit v1.1