From: Daniel Lezcano Date: Tue, 24 Jan 2012 23:56:07 +0000 (+0100) Subject: ARM: at91: remove wait_for_interrupt definition X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b59160f6c017bfe33d3483ed9a6120701644af8a;p=linux-beck.git ARM: at91: remove wait_for_interrupt definition 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 Signed-off-by: Nicolas Ferre --- diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 87be5aa18753..d7e8d4cbc5ef 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -262,7 +262,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 715813ed73e3..38f9a13ee794 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_AT91SAM9G45) #include @@ -76,8 +72,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 @@ -104,9 +98,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