svn commit: r335896 - head/sys/dev/ata

Sean Bruno sbruno at FreeBSD.org
Tue Jul 3 16:18:00 UTC 2018


Author: sbruno
Date: Tue Jul  3 16:17:59 2018
New Revision: 335896
URL: https://svnweb.freebsd.org/changeset/base/335896

Log:
  Reset indentiation of ata_suspend() such that its clear we fall through
  this function and that we aren't supposed to be controlled by the first
  if() conditional.  Found with gcc.
  
  No functional change is intended with this commit.

Modified:
  head/sys/dev/ata/ata-all.c

Modified: head/sys/dev/ata/ata-all.c
==============================================================================
--- head/sys/dev/ata/ata-all.c	Tue Jul  3 16:07:04 2018	(r335895)
+++ head/sys/dev/ata/ata-all.c	Tue Jul  3 16:17:59 2018	(r335896)
@@ -316,13 +316,13 @@ ata_suspend(device_t dev)
     if (!dev || !(ch = device_get_softc(dev)))
 	return ENXIO;
 
-	if (ch->flags & ATA_PERIODIC_POLL)
-		callout_drain(&ch->poll_callout);
-	mtx_lock(&ch->state_mtx);
-	xpt_freeze_simq(ch->sim, 1);
-	while (ch->state != ATA_IDLE)
-		msleep(ch, &ch->state_mtx, PRIBIO, "atasusp", hz/100);
-	mtx_unlock(&ch->state_mtx);
+    if (ch->flags & ATA_PERIODIC_POLL)
+	callout_drain(&ch->poll_callout);
+    mtx_lock(&ch->state_mtx);
+    xpt_freeze_simq(ch->sim, 1);
+    while (ch->state != ATA_IDLE)
+	msleep(ch, &ch->state_mtx, PRIBIO, "atasusp", hz/100);
+    mtx_unlock(&ch->state_mtx);
     return(0);
 }
 


More information about the svn-src-head mailing list