* [PATCH 3/3] ARM: OMAP2+: board-generic: Replace #if defined by #ifdef for consistency
@ 2011-12-06 16:49 Benoit Cousson
2011-12-20 13:20 ` Cousson, Benoit
0 siblings, 1 reply; 3+ messages in thread
From: Benoit Cousson @ 2011-12-06 16:49 UTC (permalink / raw)
To: linux-arm-kernel
The file contains a mix of #ifdef and #if defined().
Replace the #if... by #ifdef.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/board-generic.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index fb55fa3..09f44e0 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -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,
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 3/3] ARM: OMAP2+: board-generic: Replace #if defined by #ifdef for consistency
2011-12-06 16:49 [PATCH 3/3] ARM: OMAP2+: board-generic: Replace #if defined by #ifdef for consistency Benoit Cousson
@ 2011-12-20 13:20 ` Cousson, Benoit
2011-12-21 19:19 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Cousson, Benoit @ 2011-12-20 13:20 UTC (permalink / raw)
To: linux-arm-kernel
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
On 12/6/2011 5:49 PM, Benoit Cousson wrote:
> The file contains a mix of #ifdef and #if defined().
> Replace the #if... by #ifdef.
>
> Signed-off-by: Benoit Cousson<b-cousson@ti.com>
> Cc: Tony Lindgren<tony@atomide.com>
> ---
> arch/arm/mach-omap2/board-generic.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
> index fb55fa3..09f44e0 100644
> --- a/arch/arm/mach-omap2/board-generic.c
> +++ b/arch/arm/mach-omap2/board-generic.c
> @@ -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,
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 3/3] ARM: OMAP2+: board-generic: Replace #if defined by #ifdef for consistency
2011-12-20 13:20 ` Cousson, Benoit
@ 2011-12-21 19:19 ` Tony Lindgren
0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2011-12-21 19:19 UTC (permalink / raw)
To: linux-arm-kernel
* Cousson, Benoit <b-cousson@ti.com> [111220 04:48]:
> 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
> Thanks,
> Benoit
>
> On 12/6/2011 5:49 PM, Benoit Cousson wrote:
> >The file contains a mix of #ifdef and #if defined().
> >Replace the #if... by #ifdef.
> >
> >Signed-off-by: Benoit Cousson<b-cousson@ti.com>
> >Cc: Tony Lindgren<tony@atomide.com>
> >---
> > arch/arm/mach-omap2/board-generic.c | 8 ++++----
> > 1 files changed, 4 insertions(+), 4 deletions(-)
> >
> >diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
> >index fb55fa3..09f44e0 100644
> >--- a/arch/arm/mach-omap2/board-generic.c
> >+++ b/arch/arm/mach-omap2/board-generic.c
> >@@ -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,
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-21 19:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-06 16:49 [PATCH 3/3] ARM: OMAP2+: board-generic: Replace #if defined by #ifdef for consistency Benoit Cousson
2011-12-20 13:20 ` Cousson, Benoit
2011-12-21 19:19 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).