svn commit: r205811 - stable/7/sys/dev/aac

[Ed Maste]

Author: emaste
Date: Mon Mar 29 00:09:56 2010
New Revision: 205811
URL: http://svn.freebsd.org/changeset/base/205811

Log:
  MFC r204264:
  
    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.

Modified:
  stable/7/sys/dev/aac/aac.c
  stable/7/sys/dev/aac/aac_cam.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/aac/aac.c
==============================================================================
--- stable/7/sys/dev/aac/aac.c	Mon Mar 29 00:08:58 2010	(r205810)
+++ stable/7/sys/dev/aac/aac.c	Mon Mar 29 00:09:56 2010	(r205811)
@@ -1215,7 +1215,6 @@ aac_bio_command(struct aac_softc *sc, st
 	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;
@@ -1370,7 +1369,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);
@@ -1420,6 +1418,7 @@ aac_release_command(struct aac_command *
 	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;

Modified: stable/7/sys/dev/aac/aac_cam.c
==============================================================================
--- stable/7/sys/dev/aac/aac_cam.c	Mon Mar 29 00:08:58 2010	(r205810)
+++ stable/7/sys/dev/aac/aac_cam.c	Mon Mar 29 00:09:56 2010	(r205811)
@@ -453,7 +453,6 @@ aac_cam_action(struct cam_sim *sim, unio
 	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	|