svn commit: r316845 - stable/11/sys/dev/aacraid

[Andriy Gapon]

Author: avg
Date: Fri Apr 14 15:06:16 2017
New Revision: 316845
URL: https://svnweb.freebsd.org/changeset/base/316845

Log:
  MFC r315858: aacraid: rework r315083 for a clean build with and without AACRAID_DEBUG

Modified:
  stable/11/sys/dev/aacraid/aacraid_cam.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/aacraid/aacraid_cam.c
==============================================================================
--- stable/11/sys/dev/aacraid/aacraid_cam.c	Fri Apr 14 14:48:55 2017	(r316844)
+++ stable/11/sys/dev/aacraid/aacraid_cam.c	Fri Apr 14 15:06:16 2017	(r316845)
@@ -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];