From: Marek Vasut <marex@denx.de>
Date: Fri, 17 Jul 2015 00:40:21 +0000 (+0200)
Subject: ddr: altera: Internal mem_calibrate() cleanup part 4
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c50ae30341b002731c60bc385a1b29ac03251cc2;p=project%2Fbcm63xx%2Fu-boot.git

ddr: altera: Internal mem_calibrate() cleanup part 4

This is kind of microseries-within-series indent cleanup.
Rework the code for the last loop within the mega-loop
to make it actually readable and not an insane cryptic pile
of indent failure.

It is likely that this patch has checkpatch warnings, but
for the sake of not breaking the code, these are ignored.

No functional change.

Signed-off-by: Marek Vasut <marex@denx.de>
---

diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c
index 7384c169a0..5e3fec3e99 100644
--- a/drivers/ddr/altera/sequencer.c
+++ b/drivers/ddr/altera/sequencer.c
@@ -3419,17 +3419,19 @@ static uint32_t mem_calibrate(void)
 		if (failing_groups != 0)
 			return 0;
 
+		if (STATIC_CALIB_STEPS & CALIB_SKIP_LFIFO)
+			continue;
+
+		/*
+		 * If we're skipping groups as part of debug,
+		 * don't calibrate LFIFO.
+		 */
+		if (param->skip_groups != 0)
+			continue;
+
 		/* Calibrate the LFIFO */
-		if (!((STATIC_CALIB_STEPS) & CALIB_SKIP_LFIFO)) {
-			/*
-			 * If we're skipping groups as part of debug,
-			 * don't calibrate LFIFO.
-			 */
-			if (param->skip_groups == 0) {
-				if (!rw_mgr_mem_calibrate_lfifo())
-					return 0;
-			}
-		}
+		if (!rw_mgr_mem_calibrate_lfifo())
+			return 0;
 	}
 
 	/*