From: Marek Vasut <marex@denx.de>
Date: Fri, 17 Jul 2015 00:38:51 +0000 (+0200)
Subject: ddr: altera: Internal mem_calibrate() cleanup part 3
X-Git-Tag: v2015.10-rc2~295
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8213609e68e40bf5baf3d89d3378f24892f371d9;p=u-boot

ddr: altera: Internal mem_calibrate() cleanup part 3

This is kind of microseries-within-series indent cleanup.
Rework the code for the third loop within the middle-loop
of 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 e2e7184fff..7384c169a0 100644
--- a/drivers/ddr/altera/sequencer.c
+++ b/drivers/ddr/altera/sequencer.c
@@ -3390,28 +3390,21 @@ static uint32_t mem_calibrate(void)
 			}
 
 			if (group_failed == 0) {
-				for (read_group = write_group *
-				RW_MGR_MEM_IF_READ_DQS_WIDTH /
-				RW_MGR_MEM_IF_WRITE_DQS_WIDTH,
-				read_test_bgn = 0;
-					read_group < (write_group + 1)
-					* RW_MGR_MEM_IF_READ_DQS_WIDTH
-					/ RW_MGR_MEM_IF_WRITE_DQS_WIDTH &&
-					group_failed == 0;
-					read_group++, read_test_bgn +=
-					RW_MGR_MEM_DQ_PER_READ_DQS) {
-					if (!((STATIC_CALIB_STEPS) &
-						CALIB_SKIP_WRITES)) {
-				if (!rw_mgr_mem_calibrate_vfifo_end
-					(read_group, read_test_bgn)) {
-						group_failed = 1;
-
-					if (!(gbl->phy_debug_mode_flags
-					& PHY_DEBUG_SWEEP_ALL_GROUPS)) {
-							return 0;
-							}
-						}
-					}
+				for (read_group = write_group * rwdqs_ratio,
+				     read_test_bgn = 0;
+				     read_group < (write_group + 1) * rwdqs_ratio && group_failed == 0;
+				     read_group++,
+				     read_test_bgn += RW_MGR_MEM_DQ_PER_READ_DQS) {
+					if (STATIC_CALIB_STEPS & CALIB_SKIP_WRITES)
+						continue;
+
+					if (rw_mgr_mem_calibrate_vfifo_end(read_group,
+									read_test_bgn))
+						continue;
+
+					group_failed = 1;
+					if (!(gbl->phy_debug_mode_flags & PHY_DEBUG_SWEEP_ALL_GROUPS))
+						return 0;
 				}
 			}