[PATCH 1/2] ARM: imx: Remove unneeded .map_io initialization

[PATCH 1/2] ARM: imx: Remove unneeded .map_io initialization

[Geert Uytterhoeven]

If machine_desc.map_io is not set, devicemaps_init() in the common ARM
code will call debug_ll_io_init().

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Untested

 arch/arm/mach-imx/mach-imx6sl.c | 1 -
 arch/arm/mach-imx/mach-imx6sx.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c
index ed263a21d928da39..28ba204e611d1186 100644
--- a/arch/arm/mach-imx/mach-imx6sl.c
+++ b/arch/arm/mach-imx/mach-imx6sl.c
@@ -76,7 +76,6 @@ static const char * const imx6sl_dt_compat[] __initconst = {
 };
 
 DT_MACHINE_START(IMX6SL, "Freescale i.MX6 SoloLite (Device Tree)")
-	.map_io		= debug_ll_io_init,
 	.init_irq	= imx6sl_init_irq,
 	.init_machine	= imx6sl_init_machine,
 	.init_late      = imx6sl_init_late,
diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c
index 3de3b7369aef10ca..54fd64b184c8b3e8 100644
--- a/arch/arm/mach-imx/mach-imx6sx.c
+++ b/arch/arm/mach-imx/mach-imx6sx.c
@@ -53,7 +53,6 @@ static const char * const imx6sx_dt_compat[] __initconst = {
 };
 
 DT_MACHINE_START(IMX6SX, "Freescale i.MX6 SoloX (Device Tree)")
-	.map_io		= debug_ll_io_init,
 	.init_irq	= imx6sx_init_irq,
 	.init_machine	= imx6sx_init_machine,
 	.dt_compat	= imx6sx_dt_compat,
-- 
1.9.1

[PATCH 2/2] ARM: nspire: Remove unneeded nspire_map_io()

[Geert Uytterhoeven]

nspire_map_io() just calls debug_ll_io_init().

If machine_desc.map_io is not set, devicemaps_init() in the
common ARM code will call debug_ll_io_init(), so nspire_map_io() and the
initialization of .map_io can be removed.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Untested

 arch/arm/mach-nspire/nspire.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/arch/arm/mach-nspire/nspire.c b/arch/arm/mach-nspire/nspire.c
index 3d24ebf120953d93..1b7bd7bc62390fc1 100644
--- a/arch/arm/mach-nspire/nspire.c
+++ b/arch/arm/mach-nspire/nspire.c
@@ -35,11 +35,6 @@ static const char *nspire_dt_match[] __initconst = {
 	NULL,
 };
 
-static void __init nspire_map_io(void)
-{
-	debug_ll_io_init();
-}
-
 static struct clcd_board nspire_clcd_data = {
 	.name		= "LCD",
 	.caps		= CLCD_CAP_5551 | CLCD_CAP_565,
@@ -74,7 +69,6 @@ static void nspire_restart(enum reboot_mode mode, const char *cmd)
 
 DT_MACHINE_START(NSPIRE, "TI-NSPIRE")
 	.dt_compat	= nspire_dt_match,
-	.map_io		= nspire_map_io,
 	.init_machine	= nspire_init,
 	.restart	= nspire_restart,
 MACHINE_END
-- 
1.9.1

[PATCH 1/2] ARM: imx: Remove unneeded .map_io initialization

[Russell King - ARM Linux]

On Fri, Nov 14, 2014 at 04:53:57PM +0100, Geert Uytterhoeven wrote:
> If machine_desc.map_io is not set, devicemaps_init() in the common ARM
> code will call debug_ll_io_init().

How about a WARN_ON(mdesc->map_io == debug_ll_io_init) ?  This can only
really be done when CONFIG_DEBUG_LL is defined because otherwise it's an
inline function, but it may help to stop these from appearing in the
first place.

-- 
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.

[PATCH 1/2] ARM: imx: Remove unneeded .map_io initialization

[Geert Uytterhoeven]

On Fri, Nov 14, 2014 at 5:02 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Fri, Nov 14, 2014 at 04:53:57PM +0100, Geert Uytterhoeven wrote:
>> If machine_desc.map_io is not set, devicemaps_init() in the common ARM
>> code will call debug_ll_io_init().
>
> How about a WARN_ON(mdesc->map_io == debug_ll_io_init) ?  This can only
> really be done when CONFIG_DEBUG_LL is defined because otherwise it's an
> inline function, but it may help to stop these from appearing in the
> first place.

I'd rather have a BUILD_BUG_ON(). Unfortunately MACHINE_END doesn't
know about the machine type, else we could probably add a check to that
macro.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

[PATCH 1/2] ARM: imx: Remove unneeded .map_io initialization

[Shawn Guo]

On Fri, Nov 14, 2014 at 04:53:57PM +0100, Geert Uytterhoeven wrote:
> If machine_desc.map_io is not set, devicemaps_init() in the common ARM
> code will call debug_ll_io_init().
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Applied, thanks.