diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-04-30 13:00:32 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-10-04 16:59:51 +0200 |
| commit | 9e0e4e11623e57c0f6635f5dc6972244ce511f77 (patch) | |
| tree | 695428b6b4f70457aad8e6cf5aa8fd02d6f48aa8 | |
| parent | ac09281a026aad1fe489419bc948ba88b910e242 (diff) | |
| download | kernel_goldelico_gta04-9e0e4e11623e57c0f6635f5dc6972244ce511f77.zip kernel_goldelico_gta04-9e0e4e11623e57c0f6635f5dc6972244ce511f77.tar.gz kernel_goldelico_gta04-9e0e4e11623e57c0f6635f5dc6972244ce511f77.tar.bz2 | |
ARM: at91: unused variable in at91_pm_verify_clocks
The code using the variable 'i' in this function is conditional which
results in a harmless compiler warning. Using the IS_ENABLED macro
instead of #ifdef makes the code look nicer and gets rid of the
warning.
Without this patch, building at91sam9263_defconfig results in:
/home/arnd/linux-arm/arch/arm/mach-at91/pm.c: In function 'at91_pm_verify_clocks':
/home/arnd/linux-arm/arch/arm/mach-at91/pm.c:137:6: warning: unused variable 'i' [-Wunused-variable]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
| -rw-r--r-- | arch/arm/mach-at91/pm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 2c2d865..5315f05 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -153,7 +153,9 @@ static int at91_pm_verify_clocks(void) } } -#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS + if (!IS_ENABLED(CONFIG_AT91_PROGRAMMABLE_CLOCKS)) + return 1; + /* PCK0..PCK3 must be disabled, or configured to use clk32k */ for (i = 0; i < 4; i++) { u32 css; @@ -167,7 +169,6 @@ static int at91_pm_verify_clocks(void) return 0; } } -#endif return 1; } |