diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-16 20:07:49 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-31 19:26:18 +0300 |
| commit | 26922c59092c451f9888d0f1d1d72ebdafdc2628 (patch) | |
| tree | 5ea598145cd82a8c3d37870562fa7e74c0d349ab /arch/arm/mach-s3c64xx/include | |
| parent | b71976128c6ac7e083d624613aca43a1c5c7fcd3 (diff) | |
| download | linux-26922c59092c451f9888d0f1d1d72ebdafdc2628.tar.xz | |
ARM: s3c: simplify s3c_irqwake_{e,}intallow definition
For a long time, gcc has warned about odd configurations on s3c64xx:
In file included from arch/arm/plat-samsung/pm.c:34:0:
arch/arm/mach-s3c64xx/include/mach/pm-core.h:61:0: warning: "s3c_irqwake_eintallow" redefined
#define s3c_irqwake_eintallow ((1 << 28) - 1)
In file included from arch/arm/plat-samsung/pm.c:33:0:
arch/arm/plat-samsung/include/plat/pm.h:49:0: note: this is the location of the previous definition
#define s3c_irqwake_eintallow 0
The definitions of s3c_irqwake_intallow and s3c_irqwake_eintallow are a
bit consistent between the various platforms. Things have become easier
now that it's only s3c24xx and s3c64xx that use them at all, so I've tried
to rearrange the definitions to make it more obvious what is going on.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c64xx/include')
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/pm-core.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/pm-core.h b/arch/arm/mach-s3c64xx/include/mach/pm-core.h index 549dadd5f487..4a285e97afff 100644 --- a/arch/arm/mach-s3c64xx/include/mach/pm-core.h +++ b/arch/arm/mach-s3c64xx/include/mach/pm-core.h @@ -59,9 +59,13 @@ static inline void s3c_pm_arch_show_resume_irqs(void) /* make these defines, we currently do not have any need to change * the IRQ wake controls depending on the CPU we are running on */ - +#ifdef CONFIG_PM_SLEEP #define s3c_irqwake_eintallow ((1 << 28) - 1) #define s3c_irqwake_intallow (~0) +#else +#define s3c_irqwake_eintallow 0 +#define s3c_irqwake_intallow 0 +#endif static inline void s3c_pm_arch_update_uart(void __iomem *regs, struct pm_uart_save *save) |