Skip to content

Commit

Permalink
ARM: shmobile: Rework SH73A0_SCU_BASE IOMEM() usage
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Magnus Damm authored and Simon Horman committed Mar 12, 2013
1 parent 73e5709 commit 7685350
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-shmobile/smp-sh73a0.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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));
}
Expand Down

0 comments on commit 7685350

Please sign in to comment.