]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ARM: shmobile: Rework SH73A0_SCU_BASE IOMEM() usage
authorMagnus Damm <damm@opensource.se>
Mon, 18 Feb 2013 13:47:07 +0000 (22:47 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 12 Mar 2013 17:13:20 +0000 (02:13 +0900)
Rework the IOMEM() usage for the SCU base address in the
case of sh73a0. Removes recently introduced build warnings:

arch/arm/mach-shmobile/smp-sh73a0.c:45:15: warning: initialization makes integer from pointer without a cast [enabled by default]
arch/arm/mach-shmobile/smp-sh73a0.c:45:15: warning: (near initialization for 'twd_local_timer.res[0].start') [enabled by default]
arch/arm/mach-shmobile/smp-sh73a0.c:45:15: warning: initialization makes integer from pointer without a cast [enabled by default]
/arch/arm/mach-shmobile/smp-sh73a0.c:45:15: warning: (near initialization for 'twd_local_timer.res[0].end') [enabled by default]

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/mach-shmobile/smp-sh73a0.c

index 2244fd074f72bad1b89510d13738b8d680b79f66..593f8de28c5efad97dc248d3efb8294991117a76 100644 (file)
@@ -39,7 +39,7 @@
 
 #define PSTR_SHUTDOWN_MODE     3
 
-#define SH73A0_SCU_BASE IOMEM(0xf0000000)
+#define SH73A0_SCU_BASE 0xf0000000
 
 #ifdef CONFIG_HAVE_ARM_TWD
 static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, SH73A0_SCU_BASE + 0x600, 29);
@@ -81,7 +81,7 @@ static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus)
 static void __init sh73a0_smp_init_cpus(void)
 {
        /* setup sh73a0 specific SCU base */
-       shmobile_scu_base = SH73A0_SCU_BASE;
+       shmobile_scu_base = IOMEM(SH73A0_SCU_BASE);
 
        shmobile_smp_init_cpus(scu_get_core_count(shmobile_scu_base));
 }