svn commit: r315858 - head/sys/dev/aacraid

[Andriy Gapon]

Author: avg
Date: Thu Mar 23 11:59:17 2017
New Revision: 315858
URL: https://svnweb.freebsd.org/changeset/base/315858

Log:
  aacraid: rework r315083 for a clean build with and without AACRAID_DEBUG
  
  r315083 essentially reverted r263954 which was made for a good reason,
  but didn't take into account AACRAID_DEBUG.
  Now both types of build should be clean.
  
  MFC after:	5 days
  No MFC to:	stable/10

Modified:
  head/sys/dev/aacraid/aacraid_cam.c

Modified: head/sys/dev/aacraid/aacraid_cam.c
==============================================================================
--- head/sys/dev/aacraid/aacraid_cam.c	Thu Mar 23 10:50:45 2017	(r315857)
+++ head/sys/dev/aacraid/aacraid_cam.c	Thu Mar 23 11:59:17 2017	(r315858)
@@ -243,13 +243,11 @@ static int
 aac_cam_probe(device_t dev)
 {
 	struct aac_cam *camsc;
-	struct aac_softc *sc;
 
 	camsc = (struct aac_cam *)device_get_softc(dev);
 	if (!camsc->inf)
 		return (0);
-	sc = camsc->inf->aac_sc;
-	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
+	fwprintf(camsc->inf->aac_sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 	return (0);
 }
 
@@ -1136,11 +1134,9 @@ static void
 aac_container_complete(struct aac_command *cm)
 {
 	union	ccb *ccb;
-	struct	aac_softc *sc;
 	u_int32_t status;
 
-	sc = cm->cm_sc;
-	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
+	fwprintf(cm->cm_sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 	ccb = cm->cm_ccb;
 	status = ((u_int32_t *)cm->cm_fib->data)[0];