瀏覽代碼

ddr: altera: Internal mem_calibrate() cleanup part 1

This is kind of microseries-within-series indent cleanup.
Rework the code for the first 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>
Marek Vasut 9 年之前
父節點
當前提交
33c42bb88c
共有 1 個文件被更改,包括 17 次插入23 次删除
  1. 17 23
      drivers/ddr/altera/sequencer.c

+ 17 - 23
drivers/ddr/altera/sequencer.c

@@ -3270,6 +3270,9 @@ static uint32_t mem_calibrate(void)
 	uint32_t group_failed = 0;
 	uint32_t sr_failed = 0;
 
+	const u32 rwdqs_ratio = RW_MGR_MEM_IF_READ_DQS_WIDTH /
+				RW_MGR_MEM_IF_WRITE_DQS_WIDTH;
+
 	debug("%s:%d\n", __func__, __LINE__);
 
 	/* Initialize the data settings */
@@ -3339,31 +3342,22 @@ static uint32_t mem_calibrate(void)
 					    SCC_MGR_GROUP_COUNTER_OFFSET);
 			scc_mgr_zero_group(write_group, 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) {
+			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_VFIFO)
+					continue;
+
 				/* Calibrate the VFIFO */
-				if (!((STATIC_CALIB_STEPS) &
-					CALIB_SKIP_VFIFO)) {
-					if (!rw_mgr_mem_calibrate_vfifo
-						(read_group,
-						read_test_bgn)) {
-						group_failed = 1;
+				if (rw_mgr_mem_calibrate_vfifo(read_group,
+							       read_test_bgn))
+					continue;
 
-						if (!(gbl->
-						phy_debug_mode_flags &
-					PHY_DEBUG_SWEEP_ALL_GROUPS)) {
-							return 0;
-						}
-					}
-				}
+				group_failed = 1;
+				if (!(gbl->phy_debug_mode_flags & PHY_DEBUG_SWEEP_ALL_GROUPS))
+					return 0;
 			}
 
 			/* Calibrate the output side */