From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Fri, 17 Jun 2016 12:51:48 +0000 (+0900)
Subject: ARM: move #ifdef to match the error handling code
X-Git-Tag: v2016.07-rc3~45
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6441e3deb429f218c05e6a71fbbb89e7519e2e52;p=u-boot

ARM: move #ifdef to match the error handling code

Match the #ifdef ... #endif and the code,

   ret = do_something();
   if (ret)
           return ret;

This will make it easier to add more #ifdef'ed code.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 7677358742..76b75d8e46 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -42,11 +42,14 @@ int arch_fixup_fdt(void *blob)
 	}
 
 	ret = fdt_fixup_memory_banks(blob, start, size, CONFIG_NR_DRAM_BANKS);
-#ifdef CONFIG_ARMV7_NONSEC
 	if (ret)
 		return ret;
 
+#ifdef CONFIG_ARMV7_NONSEC
 	ret = psci_update_dt(blob);
+	if (ret)
+		return ret;
 #endif
-	return ret;
+
+	return 0;
 }