* [PATCH] OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linus
@ 2011-02-26 1:40 Paul Walmsley
2011-02-26 15:05 ` Sergei Shtylyov
0 siblings, 1 reply; 5+ messages in thread
From: Paul Walmsley @ 2011-02-26 1:40 UTC (permalink / raw)
To: linux-arm-kernel
On non-OMAP2 and non-OMAP3 kernel configs, turn omap2_sdrc_init() into
a no-op. Otherwise, compilation breaks on an OMAP4-only config with
the current omap-for-linus branch:
arch/arm/mach-omap2/built-in.o: In function `omap2_init_common_devices':
../mach-omap2/io.c:421: undefined reference to `omap2_sdrc_init'
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
---
arch/arm/plat-omap/include/plat/sdrc.h | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/sdrc.h b/arch/arm/plat-omap/include/plat/sdrc.h
index efd87c8..5a44b14 100644
--- a/arch/arm/plat-omap/include/plat/sdrc.h
+++ b/arch/arm/plat-omap/include/plat/sdrc.h
@@ -124,8 +124,13 @@ struct omap_sdrc_params {
u32 mr;
};
+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
void __init omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
struct omap_sdrc_params *sdrc_cs1);
+#else
+#define omap2_sdrc_init(x, y) 0
+#endif
+
int omap2_sdrc_get_params(unsigned long r,
struct omap_sdrc_params **sdrc_cs0,
struct omap_sdrc_params **sdrc_cs1);
--
1.7.2.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linus
2011-02-26 1:40 [PATCH] OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linus Paul Walmsley
@ 2011-02-26 15:05 ` Sergei Shtylyov
2011-02-28 0:03 ` Paul Walmsley
0 siblings, 1 reply; 5+ messages in thread
From: Sergei Shtylyov @ 2011-02-26 15:05 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 26-02-2011 4:40, Paul Walmsley wrote:
> On non-OMAP2 and non-OMAP3 kernel configs, turn omap2_sdrc_init() into
> a no-op. Otherwise, compilation breaks on an OMAP4-only config with
> the current omap-for-linus branch:
> arch/arm/mach-omap2/built-in.o: In function `omap2_init_common_devices':
> ../mach-omap2/io.c:421: undefined reference to `omap2_sdrc_init'
> Signed-off-by: Paul Walmsley<paul@pwsan.com>
> Cc: Tony Lindgren<tony@atomide.com>
> ---
> arch/arm/plat-omap/include/plat/sdrc.h | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
> diff --git a/arch/arm/plat-omap/include/plat/sdrc.h b/arch/arm/plat-omap/include/plat/sdrc.h
> index efd87c8..5a44b14 100644
> --- a/arch/arm/plat-omap/include/plat/sdrc.h
> +++ b/arch/arm/plat-omap/include/plat/sdrc.h
> @@ -124,8 +124,13 @@ struct omap_sdrc_params {
> u32 mr;
> };
>
> +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
> void __init omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
> struct omap_sdrc_params *sdrc_cs1);
> +#else
> +#define omap2_sdrc_init(x, y) 0
How about empty inline instead?
> +#endif
> +
WBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linus
2011-02-26 15:05 ` Sergei Shtylyov
@ 2011-02-28 0:03 ` Paul Walmsley
2011-02-28 11:49 ` Sergei Shtylyov
0 siblings, 1 reply; 5+ messages in thread
From: Paul Walmsley @ 2011-02-28 0:03 UTC (permalink / raw)
To: linux-arm-kernel
Hello Sergei
On Sat, 26 Feb 2011, Sergei Shtylyov wrote:
> How about empty inline instead?
Thanks for the review; that is indeed a better approach. Following is the
updated patch.
Tony, do you want to take this one?
- Paul
From: Paul Walmsley <paul@pwsan.com>
Date: Fri, 25 Feb 2011 17:38:25 -0700
Subject: [PATCH] OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linus
On non-OMAP2 and non-OMAP3 kernel configs, turn omap2_sdrc_init() into
a no-op. Otherwise, compilation breaks on an OMAP4-only config with
the current omap-for-linus branch:
arch/arm/mach-omap2/built-in.o: In function `omap2_init_common_devices':
../mach-omap2/io.c:421: undefined reference to `omap2_sdrc_init'
Thanks to Sergei Shtylyov <sshtylyov@mvista.com> for suggesting the use
of a empty static inline function rather than a macro.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Sergei Shtylyov <sshtylyov@mvista.com>
---
arch/arm/plat-omap/include/plat/sdrc.h | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/sdrc.h b/arch/arm/plat-omap/include/plat/sdrc.h
index efd87c8..2a34a65 100644
--- a/arch/arm/plat-omap/include/plat/sdrc.h
+++ b/arch/arm/plat-omap/include/plat/sdrc.h
@@ -124,8 +124,14 @@ struct omap_sdrc_params {
u32 mr;
};
+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
void __init omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
struct omap_sdrc_params *sdrc_cs1);
+#else
+static inline void __init omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
+ struct omap_sdrc_params *sdrc_cs1) {};
+#endif
+
int omap2_sdrc_get_params(unsigned long r,
struct omap_sdrc_params **sdrc_cs0,
struct omap_sdrc_params **sdrc_cs1);
--
1.7.2.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linus
2011-02-28 0:03 ` Paul Walmsley
@ 2011-02-28 11:49 ` Sergei Shtylyov
2011-03-01 1:58 ` Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: Sergei Shtylyov @ 2011-02-28 11:49 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 28-02-2011 3:03, Paul Walmsley wrote:
>> How about empty inline instead?
> Thanks for the review; that is indeed a better approach. Following is the
> updated patch.
> Tony, do you want to take this one?
> - Paul
> From: Paul Walmsley<paul@pwsan.com>
> Date: Fri, 25 Feb 2011 17:38:25 -0700
> Subject: [PATCH] OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linus
> On non-OMAP2 and non-OMAP3 kernel configs, turn omap2_sdrc_init() into
> a no-op. Otherwise, compilation breaks on an OMAP4-only config with
> the current omap-for-linus branch:
> arch/arm/mach-omap2/built-in.o: In function `omap2_init_common_devices':
> ../mach-omap2/io.c:421: undefined reference to `omap2_sdrc_init'
> Thanks to Sergei Shtylyov <sshtylyov@mvista.com> for suggesting the use
> of a empty static inline function rather than a macro.
Not at all. :-)
> Signed-off-by: Paul Walmsley<paul@pwsan.com>
> Cc: Tony Lindgren<tony@atomide.com>
> Cc: Sergei Shtylyov<sshtylyov@mvista.com>
> ---
> arch/arm/plat-omap/include/plat/sdrc.h | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
> diff --git a/arch/arm/plat-omap/include/plat/sdrc.h b/arch/arm/plat-omap/include/plat/sdrc.h
> index efd87c8..2a34a65 100644
> --- a/arch/arm/plat-omap/include/plat/sdrc.h
> +++ b/arch/arm/plat-omap/include/plat/sdrc.h
> @@ -124,8 +124,14 @@ struct omap_sdrc_params {
> u32 mr;
> };
>
> +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
> void __init omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
> struct omap_sdrc_params *sdrc_cs1);
> +#else
> +static inline void __init omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
No need to annotate it as __init.
> + struct omap_sdrc_params *sdrc_cs1) {};
> +#endif
> +
WBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linus
2011-02-28 11:49 ` Sergei Shtylyov
@ 2011-03-01 1:58 ` Tony Lindgren
0 siblings, 0 replies; 5+ messages in thread
From: Tony Lindgren @ 2011-03-01 1:58 UTC (permalink / raw)
To: linux-arm-kernel
* Sergei Shtylyov <sshtylyov@mvista.com> [110228 03:48]:
>
> On 28-02-2011 3:03, Paul Walmsley wrote:
>
> >Tony, do you want to take this one?
Applying..
> >+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
> > void __init omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
> > struct omap_sdrc_params *sdrc_cs1);
> >+#else
> >+static inline void __init omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
>
> No need to annotate it as __init.
..modified this.
Tony
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-03-01 1:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-26 1:40 [PATCH] OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linus Paul Walmsley
2011-02-26 15:05 ` Sergei Shtylyov
2011-02-28 0:03 ` Paul Walmsley
2011-02-28 11:49 ` Sergei Shtylyov
2011-03-01 1:58 ` 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).