Skip to contentSkip to conversation

ARM: OMAP2+: board-generic: Replace #if defined by #ifdef for consistency

PATCH New Benoit Cousson 2 participants 3 messages Dec 6, 2011 – Dec 21, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Benoit Cousson

author
#0 lore raw

PATCH 3/3 ARM: OMAP2+: board-generic: Replace #if defined by #ifdef for consistency

The file contains a mix of #ifdef and #if defined(). Replace the #if... by #ifdef.

Signed-off-by Benoit Cousson <[email protected]>
Cc Tony Lindgren <[email protected]>
---
 arch/arm/mach-omap2/board-generic.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/board-generic.c +4 -4
index fb55fa3..09f44e0 100644
@@ -92,7 +92,7 @@ static void __init omap3_init(void)
 }
 #endif
 
-#if defined(CONFIG_SOC_OMAP2420)
+#ifdef CONFIG_SOC_OMAP2420
 static const char *omap242x_boards_compat[] __initdata = {
 	"ti,omap2420",
 	NULL,

@@ -110,7 +110,7 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
 MACHINE_END
 #endif
 
-#if defined(CONFIG_SOC_OMAP2430)
+#ifdef CONFIG_SOC_OMAP2430
 static const char *omap243x_boards_compat[] __initdata = {
 	"ti,omap2430",
 	NULL,

@@ -128,7 +128,7 @@ DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)")
 MACHINE_END
 #endif
 
-#if defined(CONFIG_ARCH_OMAP3)
+#ifdef CONFIG_ARCH_OMAP3
 static const char *omap3_boards_compat[] __initdata = {
 	"ti,omap3",
 	NULL,

@@ -146,7 +146,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
 MACHINE_END
 #endif
 
-#if defined(CONFIG_ARCH_OMAP4)
+#ifdef CONFIG_ARCH_OMAP4
 static const char *omap4_boards_compat[] __initdata = {
 	"ti,omap4",
 	NULL,
Signature · 1 line
1.7.0.4
author
#1 lore raw

PATCH 3/3 ARM: OMAP2+: board-generic: Replace #if defined by #ifdef for consistency

Hi Tony,

What about that patch?

This is the only one that is missing in lo.
I know it is not a big deal, but it will make things a little bit cleaner.

Thanks,
Benoit

Quoted 49 lines · Benoit Cousson

The file contains a mix of #ifdef and #if defined(). Replace the #if... by #ifdef.

Signed-off-by Benoit Cousson<[email protected]>
Cc Tony Lindgren<[email protected]>
---
  arch/arm/mach-omap2/board-generic.c |    8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/board-generic.c +4 -4
index fb55fa3..09f44e0 100644
@@ -92,7 +92,7 @@ static void __init omap3_init(void)
  }
  #endif
 
-#if defined(CONFIG_SOC_OMAP2420)
+#ifdef CONFIG_SOC_OMAP2420
  static const char *omap242x_boards_compat[] __initdata = {
  	"ti,omap2420",
  	NULL,

@@ -110,7 +110,7 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
  MACHINE_END
  #endif
 
-#if defined(CONFIG_SOC_OMAP2430)
+#ifdef CONFIG_SOC_OMAP2430
  static const char *omap243x_boards_compat[] __initdata = {
  	"ti,omap2430",
  	NULL,

@@ -128,7 +128,7 @@ DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)")
  MACHINE_END
  #endif
 
-#if defined(CONFIG_ARCH_OMAP3)
+#ifdef CONFIG_ARCH_OMAP3
  static const char *omap3_boards_compat[] __initdata = {
  	"ti,omap3",
  	NULL,

@@ -146,7 +146,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
  MACHINE_END
  #endif
 
-#if defined(CONFIG_ARCH_OMAP4)
+#ifdef CONFIG_ARCH_OMAP4
  static const char *omap4_boards_compat[] __initdata = {
  	"ti,omap4",
  	NULL,
maintainer
#2 lore raw

PATCH 3/3 ARM: OMAP2+: board-generic: Replace #if defined by #ifdef for consistency

Quoted 6 lines · Cousson, Benoit

Hi Tony,

What about that patch?

This is the only one that is missing in lo.
I know it is not a big deal, but it will make things a little bit cleaner.

I think we should wait on this one and combine it later on into some other clean-up patch.

Regards,

Tony

Quoted 54 lines

Thanks,
Benoit

Quoted 49 lines · Benoit Cousson

The file contains a mix of #ifdef and #if defined(). Replace the #if... by #ifdef.

Signed-off-by Benoit Cousson<[email protected]>
Cc Tony Lindgren<[email protected]>
---
 arch/arm/mach-omap2/board-generic.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/board-generic.c +4 -4
index fb55fa3..09f44e0 100644
@@ -92,7 +92,7 @@ static void __init omap3_init(void)
 }
 #endif
 
-#if defined(CONFIG_SOC_OMAP2420)
+#ifdef CONFIG_SOC_OMAP2420
 static const char *omap242x_boards_compat[] __initdata = {
 	"ti,omap2420",
 	NULL,

@@ -110,7 +110,7 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
 MACHINE_END
 #endif
 
-#if defined(CONFIG_SOC_OMAP2430)
+#ifdef CONFIG_SOC_OMAP2430
 static const char *omap243x_boards_compat[] __initdata = {
 	"ti,omap2430",
 	NULL,

@@ -128,7 +128,7 @@ DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)")
 MACHINE_END
 #endif
 
-#if defined(CONFIG_ARCH_OMAP3)
+#ifdef CONFIG_ARCH_OMAP3
 static const char *omap3_boards_compat[] __initdata = {
 	"ti,omap3",
 	NULL,

@@ -146,7 +146,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
 MACHINE_END
 #endif
 
-#if defined(CONFIG_ARCH_OMAP4)
+#ifdef CONFIG_ARCH_OMAP4
 static const char *omap4_boards_compat[] __initdata = {
 	"ti,omap4",
 	NULL,