[U-Boot] [PATCH 4/6] arm64: versal: Remove one level of indentation in board_early_init_r()

Michal Simek michal.simek at xilinx.com
Tue Feb 5 09:50:04 UTC 2019


Simplify code indentation.

Signed-off-by: Michal Simek <michal.simek at xilinx.com>
---

 board/xilinx/versal/board.c | 57 +++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index fd6c8d8cb737..b49a4f473a72 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -23,42 +23,43 @@ int board_init(void)
 
 int board_early_init_r(void)
 {
-	if (current_el() == 3) {
-		u32 val;
+	u32 val;
 
-		writel(IOU_SWITCH_CTRL_CLKACT_BIT |
-		       (0x20 << IOU_SWITCH_CTRL_DIVISOR0_SHIFT),
-		       &crlapb_base->iou_switch_ctrl);
+	if (current_el() != 3)
+		return 0;
 
-		/* Global timer init - Program time stamp reference clk */
-		val = readl(&crlapb_base->timestamp_ref_ctrl);
-		val |= CRL_APB_TIMESTAMP_REF_CTRL_CLKACT_BIT;
-		writel(val, &crlapb_base->timestamp_ref_ctrl);
+	writel(IOU_SWITCH_CTRL_CLKACT_BIT |
+	       (0x20 << IOU_SWITCH_CTRL_DIVISOR0_SHIFT),
+	       &crlapb_base->iou_switch_ctrl);
 
-		debug("ref ctrl 0x%x\n",
-		      readl(&crlapb_base->timestamp_ref_ctrl));
+	/* Global timer init - Program time stamp reference clk */
+	val = readl(&crlapb_base->timestamp_ref_ctrl);
+	val |= CRL_APB_TIMESTAMP_REF_CTRL_CLKACT_BIT;
+	writel(val, &crlapb_base->timestamp_ref_ctrl);
 
-		/* Clear reset of timestamp reg */
-		writel(0, &crlapb_base->rst_timestamp);
+	debug("ref ctrl 0x%x\n",
+	      readl(&crlapb_base->timestamp_ref_ctrl));
 
-		/*
-		 * Program freq register in System counter and
-		 * enable system counter.
-		 */
-		writel(COUNTER_FREQUENCY,
-		       &iou_scntr_secure->base_frequency_id_register);
+	/* Clear reset of timestamp reg */
+	writel(0, &crlapb_base->rst_timestamp);
 
-		debug("counter val 0x%x\n",
-		      readl(&iou_scntr_secure->base_frequency_id_register));
+	/*
+	 * Program freq register in System counter and
+	 * enable system counter.
+	 */
+	writel(COUNTER_FREQUENCY,
+	       &iou_scntr_secure->base_frequency_id_register);
 
-		writel(IOU_SCNTRS_CONTROL_EN,
-		       &iou_scntr_secure->counter_control_register);
+	debug("counter val 0x%x\n",
+	      readl(&iou_scntr_secure->base_frequency_id_register));
 
-		debug("scntrs control 0x%x\n",
-		      readl(&iou_scntr_secure->counter_control_register));
-		debug("timer 0x%llx\n", get_ticks());
-		debug("timer 0x%llx\n", get_ticks());
-	}
+	writel(IOU_SCNTRS_CONTROL_EN,
+	       &iou_scntr_secure->counter_control_register);
+
+	debug("scntrs control 0x%x\n",
+	      readl(&iou_scntr_secure->counter_control_register));
+	debug("timer 0x%llx\n", get_ticks());
+	debug("timer 0x%llx\n", get_ticks());
 
 	return 0;
 }
-- 
1.9.1



More information about the U-Boot mailing list