svn commit: r255147 - projects/camlock/sys/cam

[Alexander Motin]

Author: mav
Date: Mon Sep  2 13:24:07 2013
New Revision: 255147
URL: http://svnweb.freebsd.org/changeset/base/255147

Log:
  Remove some unneeded pointer dereferences.

Modified:
  projects/camlock/sys/cam/cam_xpt.c

Modified: projects/camlock/sys/cam/cam_xpt.c
==============================================================================
--- projects/camlock/sys/cam/cam_xpt.c	Mon Sep  2 12:37:33 2013	(r255146)
+++ projects/camlock/sys/cam/cam_xpt.c	Mon Sep  2 13:24:07 2013	(r255147)
@@ -3215,8 +3215,7 @@ xpt_run_devq(struct cam_devq *devq)
 				 * available.
 				 */
 				xpt_freeze_devq(work_ccb->ccb_h.path, 1);
-				STAILQ_INSERT_TAIL(&xsoftc.highpowerq,
-						   work_ccb->ccb_h.path->device,
+				STAILQ_INSERT_TAIL(&xsoftc.highpowerq, device,
 						   highpowerq_entry);
 
 				mtx_unlock(&xsoftc.xpt_lock);
@@ -3279,12 +3278,11 @@ xpt_run_devq(struct cam_devq *devq)
 		}
 
 		/*
-		 * Device queues can be shared among multiple sim instances
-		 * that reside on different busses.  Use the SIM in the queue
-		 * CCB's path, rather than the one in the bus that was passed
-		 * into this function.
+		 * Device queues can be shared among multiple SIM instances
+		 * that reside on different busses.  Use the SIM from the
+		 * queued device, rather than the one from the calling bus.
 		 */
-		sim = work_ccb->ccb_h.path->bus->sim;
+		sim = device->sim;
 		lock = (mtx_owned(sim->mtx) == 0);
 		if (lock)
 			CAM_SIM_LOCK(sim);