Patchwork ARM: mxs: fix machines' initializers order

login
register
mail settings
Submitter Lauri Hintsala
Date Nov. 21, 2011, 8:55 a.m.
Message ID <1321865755-7423-1-git-send-email-lauri.hintsala@bluegiga.com>
Download mbox | patch
Permalink /patch/126723/
State New
Headers show

Comments

Lauri Hintsala - Nov. 21, 2011, 8:55 a.m.
Initializers of m28evk and stmp378x_devb fixed to be in order
they are called.

---
reference: http://article.gmane.org/gmane.linux.ports.arm.omap/50721

cc: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Lauri Hintsala <lauri.hintsala@bluegiga.com>
---
 arch/arm/mach-mxs/mach-m28evk.c        |    2 +-
 arch/arm/mach-mxs/mach-stmp378x_devb.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Russell King - ARM Linux - Nov. 21, 2011, 9:46 a.m.
On Mon, Nov 21, 2011 at 10:55:55AM +0200, Lauri Hintsala wrote:
> Initializers of m28evk and stmp378x_devb fixed to be in order
> they are called.
> 
> ---
> reference: http://article.gmane.org/gmane.linux.ports.arm.omap/50721
> 
> cc: Shawn Guo <shawn.guo@linaro.org>
> Signed-off-by: Lauri Hintsala <lauri.hintsala@bluegiga.com>

Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>

> ---
>  arch/arm/mach-mxs/mach-m28evk.c        |    2 +-
>  arch/arm/mach-mxs/mach-stmp378x_devb.c |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-mxs/mach-m28evk.c b/arch/arm/mach-mxs/mach-m28evk.c
> index 3b1681e..6b00577 100644
> --- a/arch/arm/mach-mxs/mach-m28evk.c
> +++ b/arch/arm/mach-mxs/mach-m28evk.c
> @@ -361,6 +361,6 @@ static struct sys_timer m28evk_timer = {
>  MACHINE_START(M28EVK, "DENX M28 EVK")
>  	.map_io		= mx28_map_io,
>  	.init_irq	= mx28_init_irq,
> -	.init_machine	= m28evk_init,
>  	.timer		= &m28evk_timer,
> +	.init_machine	= m28evk_init,
>  MACHINE_END
> diff --git a/arch/arm/mach-mxs/mach-stmp378x_devb.c b/arch/arm/mach-mxs/mach-stmp378x_devb.c
> index 177e531..6834dea 100644
> --- a/arch/arm/mach-mxs/mach-stmp378x_devb.c
> +++ b/arch/arm/mach-mxs/mach-stmp378x_devb.c
> @@ -115,6 +115,6 @@ static struct sys_timer stmp378x_dvb_timer = {
>  MACHINE_START(STMP378X, "STMP378X")
>  	.map_io		= mx23_map_io,
>  	.init_irq	= mx23_init_irq,
> -	.init_machine	= stmp378x_dvb_init,
>  	.timer		= &stmp378x_dvb_timer,
> +	.init_machine	= stmp378x_dvb_init,
>  MACHINE_END
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Shawn Guo - Nov. 22, 2011, 5:45 a.m.
On Mon, Nov 21, 2011 at 10:55:55AM +0200, Lauri Hintsala wrote:
> Initializers of m28evk and stmp378x_devb fixed to be in order
> they are called.
> 
> ---

You may not want to put a '---' here, because all the texts after
that will get dropped when I run 'git am' to apply the patch.  I
have applied the patch with this fixed.  Thanks.

Regards,
Shawn

> reference: http://article.gmane.org/gmane.linux.ports.arm.omap/50721
> 
> cc: Shawn Guo <shawn.guo@linaro.org>
> Signed-off-by: Lauri Hintsala <lauri.hintsala@bluegiga.com>
> ---

Patch

diff --git a/arch/arm/mach-mxs/mach-m28evk.c b/arch/arm/mach-mxs/mach-m28evk.c
index 3b1681e..6b00577 100644
--- a/arch/arm/mach-mxs/mach-m28evk.c
+++ b/arch/arm/mach-mxs/mach-m28evk.c
@@ -361,6 +361,6 @@  static struct sys_timer m28evk_timer = {
 MACHINE_START(M28EVK, "DENX M28 EVK")
 	.map_io		= mx28_map_io,
 	.init_irq	= mx28_init_irq,
-	.init_machine	= m28evk_init,
 	.timer		= &m28evk_timer,
+	.init_machine	= m28evk_init,
 MACHINE_END
diff --git a/arch/arm/mach-mxs/mach-stmp378x_devb.c b/arch/arm/mach-mxs/mach-stmp378x_devb.c
index 177e531..6834dea 100644
--- a/arch/arm/mach-mxs/mach-stmp378x_devb.c
+++ b/arch/arm/mach-mxs/mach-stmp378x_devb.c
@@ -115,6 +115,6 @@  static struct sys_timer stmp378x_dvb_timer = {
 MACHINE_START(STMP378X, "STMP378X")
 	.map_io		= mx23_map_io,
 	.init_irq	= mx23_init_irq,
-	.init_machine	= stmp378x_dvb_init,
 	.timer		= &stmp378x_dvb_timer,
+	.init_machine	= stmp378x_dvb_init,
 MACHINE_END