diff options
author | emaste <emaste@FreeBSD.org> | 2010-02-23 21:41:13 +0000 |
---|---|---|
committer | emaste <emaste@FreeBSD.org> | 2010-02-23 21:41:13 +0000 |
commit | de16302b4022f077896ab72e017bb3194f077726 (patch) | |
tree | b9dd9e15c40b32a9c05540a7c2179c9496159b73 | |
parent | ccd063c77620282c5d93f34e2539f3af17c42fe6 (diff) | |
download | FreeBSD-src-de16302b4022f077896ab72e017bb3194f077726.zip FreeBSD-src-de16302b4022f077896ab72e017bb3194f077726.tar.gz |
Minor diff reduction with Adaptec's driver: in aac_release_command() set
cm_queue to AAC_ADAP_NORM_CMD_QUEUE by default. In every place it was set,
it was set to AAC_ADAP_NORM_CMD_QUEUE anyhow.
-rw-r--r-- | sys/dev/aac/aac.c | 3 | ||||
-rw-r--r-- | sys/dev/aac/aac_cam.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c index fb9ef63..363972d 100644 --- a/sys/dev/aac/aac.c +++ b/sys/dev/aac/aac.c @@ -1195,7 +1195,6 @@ aac_bio_command(struct aac_softc *sc, struct aac_command **cmp) cm->cm_complete = aac_bio_complete; cm->cm_private = bp; cm->cm_timestamp = time_uptime; - cm->cm_queue = AAC_ADAP_NORM_CMD_QUEUE; /* build the FIB */ fib = cm->cm_fib; @@ -1350,7 +1349,6 @@ aac_wait_command(struct aac_command *cm) fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); /* Put the command on the ready queue and get things going */ - cm->cm_queue = AAC_ADAP_NORM_CMD_QUEUE; aac_enqueue_ready(cm); aac_startio(sc); error = msleep(cm, &sc->aac_io_lock, PRIBIO, "aacwait", 0); @@ -1400,6 +1398,7 @@ aac_release_command(struct aac_command *cm) cm->cm_flags = 0; cm->cm_complete = NULL; cm->cm_private = NULL; + cm->cm_queue = AAC_ADAP_NORM_CMD_QUEUE; cm->cm_fib->Header.XferState = AAC_FIBSTATE_EMPTY; cm->cm_fib->Header.StructType = AAC_FIBTYPE_TFIB; cm->cm_fib->Header.Flags = 0; diff --git a/sys/dev/aac/aac_cam.c b/sys/dev/aac/aac_cam.c index ba3fb9d..c1164aa 100644 --- a/sys/dev/aac/aac_cam.c +++ b/sys/dev/aac/aac_cam.c @@ -453,7 +453,6 @@ aac_cam_action(struct cam_sim *sim, union ccb *ccb) cm->cm_complete = aac_cam_complete; cm->cm_private = ccb; cm->cm_timestamp = time_uptime; - cm->cm_queue = AAC_ADAP_NORM_CMD_QUEUE; fib->Header.XferState = AAC_FIBSTATE_HOSTOWNED | |