* [PATCH] ARM: highbank: call highbank_pm_init in .init_late hook
@ 2012-09-17 2:50 Shawn Guo
2012-09-17 3:13 ` Rob Herring
0 siblings, 1 reply; 2+ messages in thread
From: Shawn Guo @ 2012-09-17 2:50 UTC (permalink / raw)
To: linux-arm-kernel
Being a module_init call, highbank_pm_init will cause problem with
multi-platform build running on other platforms. Call it in the
.init_late hook instead.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/mach-highbank/core.h | 5 +++++
arch/arm/mach-highbank/highbank.c | 6 ++++++
arch/arm/mach-highbank/pm.c | 4 +---
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-highbank/core.h b/arch/arm/mach-highbank/core.h
index 598ee78..c2e2c46 100644
--- a/arch/arm/mach-highbank/core.h
+++ b/arch/arm/mach-highbank/core.h
@@ -10,5 +10,10 @@ static inline void highbank_lluart_map_io(void) {}
extern void highbank_smc1(int fn, int arg);
extern void highbank_cpu_die(unsigned int cpu);
+#ifdef CONFIG_PM
+extern void highbank_pm_init(void);
+#else
+static inline void highbank_pm_init(void) {}
+#endif
extern struct smp_operations highbank_smp_ops;
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
index 709bd72..8b1c5ba 100644
--- a/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@ -156,6 +156,11 @@ static void __init highbank_init(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
+static void __init highbank_init_late(void)
+{
+ highbank_pm_init();
+}
+
static const char *highbank_match[] __initconst = {
"calxeda,highbank",
NULL,
@@ -168,6 +173,7 @@ DT_MACHINE_START(HIGHBANK, "Highbank")
.timer = &highbank_timer,
.handle_irq = gic_handle_irq,
.init_machine = highbank_init,
+ .init_late = highbank_init_late,
.dt_compat = highbank_match,
.restart = highbank_restart,
MACHINE_END
diff --git a/arch/arm/mach-highbank/pm.c b/arch/arm/mach-highbank/pm.c
index 33b3beb..de866f2 100644
--- a/arch/arm/mach-highbank/pm.c
+++ b/arch/arm/mach-highbank/pm.c
@@ -47,9 +47,7 @@ static const struct platform_suspend_ops highbank_pm_ops = {
.valid = suspend_valid_only_mem,
};
-static int __init highbank_pm_init(void)
+void __init highbank_pm_init(void)
{
suspend_set_ops(&highbank_pm_ops);
- return 0;
}
-module_init(highbank_pm_init);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] ARM: highbank: call highbank_pm_init in .init_late hook
2012-09-17 2:50 [PATCH] ARM: highbank: call highbank_pm_init in .init_late hook Shawn Guo
@ 2012-09-17 3:13 ` Rob Herring
0 siblings, 0 replies; 2+ messages in thread
From: Rob Herring @ 2012-09-17 3:13 UTC (permalink / raw)
To: linux-arm-kernel
On 09/16/2012 09:50 PM, Shawn Guo wrote:
> Being a module_init call, highbank_pm_init will cause problem with
> multi-platform build running on other platforms. Call it in the
> .init_late hook instead.
I don't think this needs to be init_late that I recall, so
highbank_pm_init can just be called from highbank_init. I can update it.
I've scanned all the other platforms converted and it looks like I'm the
only problem. :)
Rob
>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
> arch/arm/mach-highbank/core.h | 5 +++++
> arch/arm/mach-highbank/highbank.c | 6 ++++++
> arch/arm/mach-highbank/pm.c | 4 +---
> 3 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-highbank/core.h b/arch/arm/mach-highbank/core.h
> index 598ee78..c2e2c46 100644
> --- a/arch/arm/mach-highbank/core.h
> +++ b/arch/arm/mach-highbank/core.h
> @@ -10,5 +10,10 @@ static inline void highbank_lluart_map_io(void) {}
>
> extern void highbank_smc1(int fn, int arg);
> extern void highbank_cpu_die(unsigned int cpu);
> +#ifdef CONFIG_PM
> +extern void highbank_pm_init(void);
> +#else
> +static inline void highbank_pm_init(void) {}
> +#endif
>
> extern struct smp_operations highbank_smp_ops;
> diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
> index 709bd72..8b1c5ba 100644
> --- a/arch/arm/mach-highbank/highbank.c
> +++ b/arch/arm/mach-highbank/highbank.c
> @@ -156,6 +156,11 @@ static void __init highbank_init(void)
> of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
> }
>
> +static void __init highbank_init_late(void)
> +{
> + highbank_pm_init();
> +}
> +
> static const char *highbank_match[] __initconst = {
> "calxeda,highbank",
> NULL,
> @@ -168,6 +173,7 @@ DT_MACHINE_START(HIGHBANK, "Highbank")
> .timer = &highbank_timer,
> .handle_irq = gic_handle_irq,
> .init_machine = highbank_init,
> + .init_late = highbank_init_late,
> .dt_compat = highbank_match,
> .restart = highbank_restart,
> MACHINE_END
> diff --git a/arch/arm/mach-highbank/pm.c b/arch/arm/mach-highbank/pm.c
> index 33b3beb..de866f2 100644
> --- a/arch/arm/mach-highbank/pm.c
> +++ b/arch/arm/mach-highbank/pm.c
> @@ -47,9 +47,7 @@ static const struct platform_suspend_ops highbank_pm_ops = {
> .valid = suspend_valid_only_mem,
> };
>
> -static int __init highbank_pm_init(void)
> +void __init highbank_pm_init(void)
> {
> suspend_set_ops(&highbank_pm_ops);
> - return 0;
> }
> -module_init(highbank_pm_init);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-17 3:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-17 2:50 [PATCH] ARM: highbank: call highbank_pm_init in .init_late hook Shawn Guo
2012-09-17 3:13 ` Rob Herring
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).