Skip to contentSkip to conversation

mach-exynos: fix ISO C90 warning.

PATCH New Il Han 2 participants 2 messages Apr 2, 2012

Subsystems (3)
lore
Share & tools
lore

Il Han

author
#0 lore raw

PATCH 1/1 mach-exynos: fix ISO C90 warning.

ISO C90 forbids mixed declarations and code.
Fix it.

---
 arch/arm/mach-exynos/common.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
arch/arm/mach-exynos/common.c +2 -1
index e6cc50e..8614aab 100644
@@ -583,10 +583,11 @@ core_initcall(exynos_core_init);
 #ifdef CONFIG_CACHE_L2X0
 static int __init exynos4_l2x0_cache_init(void)
 {
+	int ret;
+
 	if (soc_is_exynos5250())
 		return 0;
 
-	int ret;
 	ret = l2x0_of_init(L2_AUX_VAL, L2_AUX_MASK);
 	if (!ret) {
 		l2x0_regs_phys = virt_to_phys(&l2x0_saved_regs);
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/1 mach-exynos: fix ISO C90 warning.

Quoted 15 lines · Il Han

ISO C90 forbids mixed declarations and code.
Fix it.

---
  arch/arm/mach-exynos/common.c |    3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)
arch/arm/mach-exynos/common.c +0 -0
index e6cc50e..8614aab 100644
@@ -583,10 +583,11 @@ core_initcall(exynos_core_init);
  #ifdef CONFIG_CACHE_L2X0
  static int __init exynos4_l2x0_cache_init(void)

arch/arm/mach-exynos/common.c core_initcall(exynos_core_init); · line 593

Quoted 10 lines
arch/arm/mach-exynos/common.c +2 -1
  {
+	int ret;
+
  	if (soc_is_exynos5250())
  		return 0;
 
-	int ret;
  	ret = l2x0_of_init(L2_AUX_VAL, L2_AUX_MASK);
  	if (!ret) {
  		l2x0_regs_phys = virt_to_phys(&l2x0_saved_regs);

Yeah, seems happened wehn merge confilcts resolved.

OK, will apply and if possible, please use following subject form in next time like others. Every ARM platfomrs use that.

'ARM: EXYNOS: ...'

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.