From mboxrd@z Thu Jan 1 00:00:00 1970 From: daniel.lezcano@linaro.org (Daniel Lezcano) Date: Wed, 18 Jan 2012 00:40:19 +0100 Subject: [PATCH 3/4] at91 : remove wait_for_interrupt definition In-Reply-To: <1326843620-13148-1-git-send-email-daniel.lezcano@linaro.org> References: <1326843620-13148-1-git-send-email-daniel.lezcano@linaro.org> Message-ID: <1326843620-13148-4-git-send-email-daniel.lezcano@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org All the "wait_for_interrupt" definition are aliases to cpu_do_idle. Only the rm9200 has an asm routine to switch to wfi. But the cpu_do_idle for this platform has exactly the same asm routine. arch/arm/mm/proc-arm920.S ... ENTRY(cpu_arm920_do_idle) mcr p15, 0, r0, c7, c0, 4 @ Wait for interrupt ... Then it is safe to invoke cpu_do_idle for this platform. As all the wait_for_interrupts are definition for cpu_do_idle, let's remove it and replace its invokation by cpu_do_idle. Signed-off-by: Daniel Lezcano --- arch/arm/mach-at91/pm.c | 2 +- arch/arm/mach-at91/pm.h | 12 ------------ 2 files changed, 1 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 62ad955..acf32c7 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -272,7 +272,7 @@ static int at91_pm_enter(suspend_state_t state) : /* no input */ : "r0"); saved_lpr = sdram_selfrefresh_enable(); - wait_for_interrupt_enable(); + cpu_do_idle(); sdram_selfrefresh_disable(saved_lpr); break; diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index 325ef76..624c99c 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h @@ -36,10 +36,6 @@ static inline u32 sdram_selfrefresh_enable(void) #define sdram_selfrefresh_disable(saved_lpr) \ at91_sys_write(AT91_SDRAMC_LPR, saved_lpr) -#define wait_for_interrupt_enable() \ - asm volatile ("mcr p15, 0, %0, c7, c0, 4" \ - : : "r" (0)) - #elif defined(CONFIG_ARCH_AT91CAP9) #include @@ -58,9 +54,6 @@ static inline u32 sdram_selfrefresh_enable(void) #define sdram_selfrefresh_disable(saved_lpr) \ at91_ramc_write(0, AT91_DDRSDRC_LPR, saved_lpr) -#define wait_for_interrupt_enable() \ - cpu_do_idle() - #elif defined(CONFIG_ARCH_AT91SAM9G45) #include @@ -97,8 +90,6 @@ static inline u32 sdram_selfrefresh_enable(void) at91_ramc_write(1, AT91_DDRSDRC_LPR, saved_lpr1); \ } while (0) -#define wait_for_interrupt_enable() cpu_do_idle() - #else #include @@ -125,9 +116,6 @@ static inline u32 sdram_selfrefresh_enable(void) #define sdram_selfrefresh_disable(saved_lpr) \ at91_ramc_write(0, AT91_SDRAMC_LPR, saved_lpr) -#define wait_for_interrupt_enable() \ - cpu_do_idle() - #endif #endif -- 1.7.5.4